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();
_cleanup_free_ char *wants = NULL;
_cleanup_free_ char *conflicts = NULL;
int r;
+ struct stat st;
before = strv_join(s->before, " ");
if (!before)
if (!unit)
return log_oom();
+ /* We might already have a symlink with the same name from a Provides:,
+ * or from backup files like /etc/init.d/foo.bak. Real scripts always win,
+ * so remove an existing link */
+ if (lstat(unit, &st) == 0 && S_ISLNK(st.st_mode)) {
+ log_warning("Overwriting existing symlink %s with real service", unit);
+ unlink(unit);
+ }
+
f = fopen(unit, "wxe");
if (!f)
return log_error_errno(errno, "Failed to create unit file %s: %m", unit);
unsigned i;
char *r;
const char *n;
+ _cleanup_free_ char *filename_no_sh = NULL;
assert(name);
assert(_r);
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. */
/* 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
if (!f)
return errno == ENOENT ? 0 : -errno;
+ log_debug("Loading SysV script %s", s->path);
+
while (!feof(f)) {
char l[LINE_MAX], *t;
continue;
if (unit_name_to_type(m) == UNIT_SERVICE) {
+ log_debug("Adding Provides: alias '%s' for '%s'", m, s->name);
r = add_alias(s->name, m);
} else {
/* NB: SysV targets
}
while ((de = readdir(d))) {
- SysvStub *service;
- struct stat st;
_cleanup_free_ char *fpath = NULL, *name = NULL;
+ _cleanup_free_ SysvStub *service = NULL;
+ struct stat st;
int r;
- if (hidden_file(de->d_name))
- continue;
+ dirent_ensure_type(d, de);
- fpath = strjoin(*path, "/", de->d_name, NULL);
- if (!fpath)
- return log_oom();
+ if (!dirent_is_file(de))
+ continue;
- if (stat(fpath, &st) < 0)
+ if (fstatat(dirfd(d), de->d_name, &st, 0) < 0) {
+ log_warning_errno(errno, "stat() failed on %s/%s: %m", *path, de->d_name);
continue;
+ }
if (!(st.st_mode & S_IXUSR))
continue;
+ if (!S_ISREG(st.st_mode))
+ continue;
+
name = sysv_translate_name(de->d_name);
if (!name)
return log_oom();
+ fpath = strjoin(*path, "/", de->d_name, NULL);
+ if (!fpath)
+ return log_oom();
+
if (hashmap_contains(all_services, name))
continue;
service->path = fpath;
r = hashmap_put(all_services, service->name, service);
- if (r < 0) {
- free(service);
+ if (r < 0)
return log_oom();
- }
name = fpath = NULL;
+ service = NULL;
}
}