clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-15 02:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

sysv-generator: Re-fix .sh suffix handling

Browse Source 
Commit 4e48855534 caused the .sh suffix to be stripped from the original
"filename", which caused the generated units to call the wrong init.d script.
Only use the .sh stripped file name for comparing with Provides:, not for
generating the Exec*= lines.

Spotted by sysv-generator-test.
This commit is contained in:
Martin Pitt
2015-01-28 08:00:28 +01:00
parent 78eb158a20
commit 40780877c1
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sysv-generator/sysv-generator.c
+3 -5
View File
@@ -299,11 +299,9 @@ static int sysv_translate_facility(const char *name, const char *filename, char
/* strip ".sh" suffix from file name for comparison */
filename_no_sh = strdupa(filename);
e = endswith(filename, ".sh");
if (e) {
e = endswith(filename_no_sh, ".sh");
if (e)
*e = '\0';
filename = filename_no_sh;
}
/* If we don't know this name, fallback heuristics to figure
* out whether something is a target or a service alias. */
@@ -314,7 +312,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char
/* Facilities starting with $ are most likely targets */
r = unit_name_build(n, NULL, ".target");
} else if (filename && streq(name, filename))
} else if (filename && streq(name, filename_no_sh))
/* Names equaling the file name of the services are redundant */
return 0;
else