diff options
| -rw-r--r-- | src/sysv-generator/sysv-generator.c | 15 | ||||
| -rw-r--r-- | test/sysv-generator-test.py | 36 |
2 files changed, 50 insertions, 1 deletions
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 4774981016..a47b0722e0 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -119,6 +119,11 @@ static int add_alias(const char *service, const char *alias) { assert(service); assert(alias); + if (streq(service, alias)) { + log_error("Ignoring creation of an alias %s for itself", service); + return 0; + } + link = strjoin(arg_dest, "/", alias, NULL); if (!link) return log_oom(); @@ -263,6 +268,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char unsigned i; char *r; const char *n; + _cleanup_free_ char *filename_no_sh = NULL; assert(name); assert(_r); @@ -284,6 +290,13 @@ static int sysv_translate_facility(const char *name, const char *filename, char goto finish; } + /* strip ".sh" suffix from file name for comparison */ + filename_no_sh = strdup(filename); + if (!filename_no_sh) + return -ENOMEM; + if (endswith(filename, ".sh")) + filename_no_sh[strlen(filename)-3] = '\0'; + /* If we don't know this name, fallback heuristics to figure * out whether something is a target or a service alias. */ @@ -293,7 +306,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 diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py index 2a84f9fcaf..a3daa9fc6b 100644 --- a/test/sysv-generator-test.py +++ b/test/sysv-generator-test.py @@ -278,6 +278,42 @@ class SysvGeneratorTest(unittest.TestCase): err, results = self.run_generator() self.assertEqual(results, {}) + def test_sh_suffix(self): + '''init.d script with .sh suffix''' + + self.add_sysv('foo.sh', {}, enable=True) + err, results = self.run_generator() + s = results['foo.service'] + + self.assertEqual(s.sections(), ['Unit', 'Service']) + # should not have a .sh + self.assertEqual(s.get('Unit', 'Description'), 'LSB: test foo service') + + # calls correct script with .sh + init_script = os.path.join(self.init_d_dir, 'foo.sh') + self.assertEqual(s.get('Service', 'ExecStart'), + '%s start' % init_script) + self.assertEqual(s.get('Service', 'ExecStop'), + '%s stop' % init_script) + + self.assert_enabled('foo.service', [2, 3, 4, 5]) + + def test_sh_suffix_with_provides(self): + '''init.d script with .sh suffix and Provides:''' + + self.add_sysv('foo.sh', {'Provides': 'foo bar'}) + err, results = self.run_generator() + # ensure we don't try to create a symlink to itself + self.assertNotIn(err, 'itself') + self.assertEqual(list(results), ['foo.service']) + self.assertEqual(results['foo.service'].get('Unit', 'Description'), + 'LSB: test foo service') + + # should create symlink for the alternative name + self.assertEqual(os.readlink(os.path.join(self.out_dir, 'bar.service')), + 'foo.service') + + if __name__ == '__main__': unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2)) |