X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsysv-generator%2Fsysv-generator.c;h=1e4d54888cfd74c516875f1036d79ef207c1dd61;hb=4e4885553447f6f4c014bfa3e5b5837a76a0e612;hp=0b8d8f73ddec2915f35f2702a95326faec507f19;hpb=95ed3294c632f5606327149f10cef1eb34422862;p=elogind.git diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 0b8d8f73d..1e4d54888 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -31,7 +31,6 @@ #include "path-util.h" #include "path-lookup.h" #include "log.h" -#include "strv.h" #include "unit.h" #include "unit-name.h" #include "special.h" @@ -78,6 +77,7 @@ typedef struct SysvStub { char **before; char **after; char **wants; + char **wanted_by; char **conflicts; bool has_lsb; bool reload; @@ -112,14 +112,42 @@ static int add_symlink(const char *service, const char *where) { return 1; } +static int add_alias(const char *service, const char *alias) { + _cleanup_free_ char *link = NULL; + int r; + + 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(); + + r = symlink(service, link); + if (r < 0) { + if (errno == EEXIST) + return 0; + return -errno; + } + + return 1; +} + static int generate_unit_file(SysvStub *s) { - char *unit; char **p; _cleanup_fclose_ FILE *f = NULL; + _cleanup_free_ char *unit = NULL; _cleanup_free_ char *before = NULL; _cleanup_free_ char *after = NULL; + _cleanup_free_ char *wants = NULL; _cleanup_free_ char *conflicts = NULL; int r; + struct stat st; before = strv_join(s->before, " "); if (!before) @@ -129,6 +157,10 @@ static int generate_unit_file(SysvStub *s) { if (!after) return log_oom(); + wants = strv_join(s->wants, " "); + if (!wants) + return log_oom(); + conflicts = strv_join(s->conflicts, " "); if (!conflicts) return log_oom(); @@ -137,15 +169,22 @@ static int generate_unit_file(SysvStub *s) { if (!unit) return log_oom(); - f = fopen(unit, "wxe"); - if (!f) { - log_error("Failed to create unit file %s: %m", unit); - return -errno; + /* 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); + fprintf(f, "# Automatically generated by systemd-sysv-generator\n\n" "[Unit]\n" + "Documentation=man:systemd-sysv-generator(8)\n" "SourcePath=%s\n" "Description=%s\n", s->path, s->description); @@ -154,6 +193,8 @@ static int generate_unit_file(SysvStub *s) { fprintf(f, "Before=%s\n", before); if (!isempty(after)) fprintf(f, "After=%s\n", after); + if (!isempty(wants)) + fprintf(f, "Wants=%s\n", wants); if (!isempty(conflicts)) fprintf(f, "Conflicts=%s\n", conflicts); @@ -168,11 +209,8 @@ static int generate_unit_file(SysvStub *s) { "RemainAfterExit=%s\n", yes_no(!s->pid_file)); - if (s->sysv_start_priority > 0) - fprintf(f, "SysVStartPriority=%d\n", s->sysv_start_priority); - if (s->pid_file) - fprintf(f, "PidFile=%s\n", s->pid_file); + fprintf(f, "PIDFile=%s\n", s->pid_file); fprintf(f, "ExecStart=%s start\n" @@ -182,10 +220,10 @@ static int generate_unit_file(SysvStub *s) { if (s->reload) fprintf(f, "ExecReload=%s reload\n", s->path); - STRV_FOREACH(p, s->wants) { + STRV_FOREACH(p, s->wanted_by) { r = add_symlink(s->name, *p); if (r < 0) - log_error_unit(s->name, "Failed to create 'Wants' symlink to %s: %s", *p, strerror(-r)); + log_unit_error_errno(s->name, r, "Failed to create 'Wants' symlink to %s: %m", *p); } return 0; @@ -236,9 +274,9 @@ static int sysv_translate_facility(const char *name, const char *filename, char "time", SPECIAL_TIME_SYNC_TARGET, }; - unsigned i; - char *r; + char *filename_no_sh, *e, *r; const char *n; + unsigned i; assert(name); assert(_r); @@ -260,6 +298,14 @@ 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 = strdupa(filename); + e = endswith(filename, ".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. */ @@ -306,6 +352,8 @@ static int load_sysv(SysvStub *s) { if (!f) return errno == ENOENT ? 0 : -errno; + log_debug("Loading SysV script %s", s->path); + while (!feof(f)) { char l[LINE_MAX], *t; @@ -313,7 +361,7 @@ static int load_sysv(SysvStub *s) { if (feof(f)) break; - log_error_unit(s->name, + log_unit_error(s->name, "Failed to read configuration file '%s': %m", s->path); return -errno; @@ -388,7 +436,7 @@ static int load_sysv(SysvStub *s) { fn = strstrip(t+8); if (!path_is_absolute(fn)) { - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] PID file not absolute. Ignoring.", s->path, line); continue; @@ -434,27 +482,28 @@ static int load_sysv(SysvStub *s) { } else if (state == LSB || state == LSB_DESCRIPTION) { if (startswith_no_case(t, "Provides:")) { - char *i, *w; + const char *word, *state_; size_t z; state = LSB; - FOREACH_WORD_QUOTED(w, z, t+9, i) { + FOREACH_WORD_QUOTED(word, z, t+9, state_) { _cleanup_free_ char *n = NULL, *m = NULL; - n = strndup(w, z); + n = strndup(word, z); if (!n) 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) { + 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 * which are provided * by a service are @@ -474,34 +523,43 @@ static int load_sysv(SysvStub *s) { r = strv_extend(&s->wants, m); if (r < 0) return log_oom(); + if (streq(m, SPECIAL_NETWORK_ONLINE_TARGET)) { + r = strv_extend(&s->before, SPECIAL_NETWORK_TARGET); + if (r < 0) + return log_oom(); + } } if (r < 0) - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] Failed to add LSB Provides name %s, ignoring: %s", s->path, line, m, strerror(-r)); } + if (!isempty(state_)) + log_unit_error(s->name, + "[%s:%u] Trailing garbage in Provides, ignoring.", + s->path, line); } else if (startswith_no_case(t, "Required-Start:") || startswith_no_case(t, "Should-Start:") || startswith_no_case(t, "X-Start-Before:") || startswith_no_case(t, "X-Start-After:")) { - char *i, *w; + const char *word, *state_; size_t z; state = LSB; - FOREACH_WORD_QUOTED(w, z, strchr(t, ':')+1, i) { + FOREACH_WORD_QUOTED(word, z, strchr(t, ':')+1, state_) { _cleanup_free_ char *n = NULL, *m = NULL; bool is_before; - n = strndup(w, z); + n = strndup(word, z); if (!n) return -ENOMEM; r = sysv_translate_facility(n, basename(s->path), &m); if (r < 0) { - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] Failed to translate LSB dependency %s, ignoring: %s", s->path, line, n, strerror(-r)); continue; @@ -535,10 +593,15 @@ static int load_sysv(SysvStub *s) { } if (r < 0) - log_error_unit(s->name, + log_unit_error(s->name, "[%s:%u] Failed to add dependency on %s, ignoring: %s", s->path, line, m, strerror(-r)); } + if (!isempty(state_)) + log_unit_error(s->name, + "[%s:%u] Trailing garbage in %*s, ignoring.", + s->path, line, + (int)(strchr(t, ':') - t), t); } else if (startswith_no_case(t, "Description:")) { char *d, *j; @@ -677,33 +740,40 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) { d = opendir(*path); if (!d) { if (errno != ENOENT) - log_warning("opendir(%s) failed: %m", *path); + log_warning_errno(errno, "opendir(%s) failed: %m", *path); continue; } 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 (ignore_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; @@ -720,6 +790,7 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) { return log_oom(); name = fpath = NULL; + service = NULL; } } @@ -752,7 +823,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { d = opendir(path); if (!d) { if (errno != ENOENT) - log_warning("opendir(%s) failed: %m", path); + log_warning_errno(errno, "opendir(%s) failed: %m", path); continue; } @@ -760,7 +831,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { while ((de = readdir(d))) { int a, b; - if (ignore_file(de->d_name)) + if (hidden_file(de->d_name)) continue; if (de->d_name[0] != 'S' && de->d_name[0] != 'K') @@ -788,10 +859,9 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { goto finish; } - if (hashmap_contains(all_services, name)) - service = hashmap_get(all_services, name); - else { - log_warning("Could not find init scirpt for %s", name); + service = hashmap_get(all_services, name); + if (!service){ + log_warning("Could not find init script for %s", name); continue; } @@ -802,8 +872,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { MAX(a*10 + b, service->sysv_start_priority); } - r = set_ensure_allocated(&runlevel_services[i], - trivial_hash_func, trivial_compare_func); + r = set_ensure_allocated(&runlevel_services[i], NULL); if (r < 0) goto finish; @@ -814,8 +883,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { } else if (de->d_name[0] == 'K' && (rcnd_table[i].type == RUNLEVEL_DOWN)) { - r = set_ensure_allocated(&shutdown_services, - trivial_hash_func, trivial_compare_func); + r = set_ensure_allocated(&shutdown_services, NULL); if (r < 0) goto finish; @@ -832,7 +900,7 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) { r = strv_extend(&service->before, rcnd_table[i].target); if (r < 0) return log_oom(); - r = strv_extend(&service->wants, rcnd_table[i].target); + r = strv_extend(&service->wanted_by, rcnd_table[i].target); if (r < 0) return log_oom(); } @@ -883,7 +951,7 @@ int main(int argc, char *argv[]) { return EXIT_FAILURE; } - all_services = hashmap_new(string_hash_func, string_compare_func); + all_services = hashmap_new(&string_hash_ops); if (!all_services) { log_oom(); return EXIT_FAILURE; @@ -905,7 +973,9 @@ int main(int argc, char *argv[]) { q = load_sysv(service); if (q < 0) continue; + } + HASHMAP_FOREACH(service, all_services, j) { q = fix_order(service, all_services); if (q < 0) continue;