X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fsysv-generator%2Fsysv-generator.c;h=45c8b4ea0f47de59bfcad41bb261fb243d1d9055;hb=9e37c9544b22aab2173695ac9c0e4b8bb02cb75c;hp=9778fbc533ed7f72fa41f7c357e2021e29b99321;hpb=d171ed1c50ba64928b7fb30ee2ae729fdfe0826b;p=elogind.git diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 9778fbc53..45c8b4ea0 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; @@ -113,11 +113,12 @@ static int add_symlink(const char *service, const char *where) { } 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; @@ -129,6 +130,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(); @@ -138,14 +143,13 @@ static int generate_unit_file(SysvStub *s) { return log_oom(); f = fopen(unit, "wxe"); - if (!f) { - log_error("Failed to create unit file %s: %m", unit); - return -errno; - } + 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 +158,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,9 +174,6 @@ 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); @@ -182,10 +185,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; @@ -313,7 +316,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 +391,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,15 +437,15 @@ 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; @@ -474,34 +477,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 +547,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,7 +694,7 @@ 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; } @@ -752,7 +769,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; } @@ -788,9 +805,8 @@ 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 { + service = hashmap_get(all_services, name); + if (!service){ log_warning("Could not find init script for %s", name); continue; } @@ -802,8 +818,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 +829,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 +846,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 +897,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;