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 (is_symlink(unit)) {
+ log_warning("Overwriting existing symlink %s with real service", unit);
+ (void) unlink(unit);
+ }
+
f = fopen(unit, "wxe");
if (!f)
return log_error_errno(errno, "Failed to create unit file %s: %m", unit);
"time", SPECIAL_TIME_SYNC_TARGET,
};
- unsigned i;
- char *r;
+ char *filename_no_sh, *e, *r;
const char *n;
+ unsigned i;
assert(name);
assert(_r);
goto finish;
}
+ /* strip ".sh" suffix from file name for comparison */
+ filename_no_sh = strdupa(filename);
+ 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. */
/* Facilities starting with $ are most likely targets */
r = unit_name_build(n, NULL, ".target");
- } else if (filename && streq(name, filename))
+ } else if (streq_ptr(n, filename))
/* Names equaling the file name of the services are redundant */
return 0;
else
/* Everything else we assume to be normal service names */
r = sysv_translate_name(n);
-
if (!r)
return -ENOMEM;
if (!f)
return errno == ENOENT ? 0 : -errno;
+ log_debug("Loading SysV script %s", s->path);
+
while (!feof(f)) {
char l[LINE_MAX], *t;
return -ENOMEM;
r = sysv_translate_facility(n, basename(s->path), &m);
-
if (r < 0)
return r;
-
if (r == 0)
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;
- fpath = strjoin(*path, "/", de->d_name, NULL);
- if (!fpath)
- return log_oom();
-
- if (stat(fpath, &st) < 0)
+ if (fstatat(dirfd(d), de->d_name, &st, AT_SYMLINK_NOFOLLOW) < 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();
if (hashmap_contains(all_services, name))
continue;
+ fpath = strjoin(*path, "/", de->d_name, NULL);
+ if (!fpath)
+ return log_oom();
+
+ if (unit_file_get_state(UNIT_FILE_SYSTEM, NULL, name) >= 0) {
+ log_debug("Native unit for %s already exists, skipping", name);
+ continue;
+ }
+
service = new0(SysvStub, 1);
if (!service)
return log_oom();
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;
}
}
service = hashmap_get(all_services, name);
if (!service){
- log_warning("Could not find init script for %s", name);
+ log_debug("Ignoring %s symlink in %s, not generating %s.",
+ de->d_name, rcnd_table[i].path, name);
continue;
}