X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fsysv-generator%2Fsysv-generator.c;h=662d08cccb2542b455dfe7902395cfd28eaad78d;hb=40780877c19ef408da8ab21f4156cfc153f94b5c;hp=09ade0dc3a308c4557f484e03a8cb7f2087f30d7;hpb=78eb158a20e2bee772f6e49d8b432b98f68cbb55;p=elogind.git diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 09ade0dc3..662d08ccc 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -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