X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fservice.c;h=6a4d350c9f4ab2f6b36821015b6691c1eecc2241;hb=cb33e400006806676baac91fb297185b179931c7;hp=1dc3e1ea00d3b38fac9ca7159ce31f3cbb40d342;hpb=ee0dd8021b3d6203235c8b0cd014431c8fb38d8f;p=elogind.git diff --git a/src/service.c b/src/service.c index 1dc3e1ea0..6a4d350c9 100644 --- a/src/service.c +++ b/src/service.c @@ -38,6 +38,7 @@ #define COMMENTS "#;\n" #define NEWLINES "\n\r" +#ifdef HAVE_SYSV_COMPAT typedef enum RunlevelType { RUNLEVEL_UP, RUNLEVEL_DOWN, @@ -80,6 +81,7 @@ static const struct { #define RUNLEVELS_UP "12345" /* #define RUNLEVELS_DOWN "06" */ /* #define RUNLEVELS_BOOT "bBsS" */ +#endif static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, @@ -108,7 +110,9 @@ static void service_init(Unit *u) { s->timeout_usec = DEFAULT_TIMEOUT_USEC; s->restart_usec = DEFAULT_RESTART_USEC; s->timer_watch.type = WATCH_INVALID; +#ifdef HAVE_SYSV_COMPAT s->sysv_start_priority = -1; +#endif s->socket_fd = -1; exec_context_init(&s->exec_context); @@ -189,11 +193,13 @@ static void service_done(Unit *u) { free(s->pid_file); s->pid_file = NULL; +#ifdef HAVE_SYSV_COMPAT free(s->sysv_path); s->sysv_path = NULL; free(s->sysv_runlevels); s->sysv_runlevels = NULL; +#endif free(s->status_text); s->status_text = NULL; @@ -219,6 +225,7 @@ static void service_done(Unit *u) { unit_unwatch_timer(u, &s->timer_watch); } +#ifdef HAVE_SYSV_COMPAT static char *sysv_translate_name(const char *name) { char *r; @@ -231,6 +238,11 @@ static char *sysv_translate_name(const char *name) { else if (endswith(name, ".sh")) /* Drop Debian-style .sh suffix */ strcpy(stpcpy(r, name) - 3, ".service"); +#ifdef TARGET_ARCH + else if (startswith(name, "@")) + /* Drop Arch-style background prefix */ + strcpy(stpcpy(r, name + 1), ".service"); +#endif else /* Normal init scripts */ strcpy(stpcpy(r, name), ".service"); @@ -260,13 +272,18 @@ static int sysv_translate_facility(const char *name, char **_r) { #ifdef TARGET_FEDORA /* Fedora extensions, lacking the $ prefix */ "MTA", SPECIAL_MAIL_TRANSFER_AGENT_TARGET, - "smtpdaemon", SPECIAL_MAIL_TRANSFER_AGENT_TARGET + "smtpdaemon", SPECIAL_MAIL_TRANSFER_AGENT_TARGET, + "httpd", SPECIAL_HTTP_DAEMON_TARGET, #endif }; unsigned i; char *r; + /* SuSE insserv extension */ + if (streq(name, "$null")) + return 0; + for (i = 0; i < ELEMENTSOF(table); i += 2) if (streq(table[i], name)) { if (!(r = strdup(table[i+1]))) @@ -276,9 +293,11 @@ static int sysv_translate_facility(const char *name, char **_r) { } if (*name == '$') - return 0; + r = unit_name_build(name+1, NULL, ".target"); + else + r = sysv_translate_name(name); - if (!(r = sysv_translate_name(name))) + if (!r) return -ENOMEM; finish: @@ -311,13 +330,16 @@ static int sysv_fix_order(Service *s) { if (s == t) continue; + if (t->meta.load_state != UNIT_LOADED) + continue; + if (t->sysv_start_priority < 0) continue; /* If both units have modern headers we don't care * about the priorities */ - if ((!s->sysv_path || s->sysv_has_lsb) && - (!t->sysv_path || t->sysv_has_lsb)) + if ((s->meta.fragment_path || s->sysv_has_lsb) && + (t->meta.fragment_path || t->sysv_has_lsb)) continue; special_s = s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels); @@ -823,6 +845,7 @@ static int service_load_sysv(Service *s) { return 0; } +#endif static int service_verify(Service *s) { assert(s); @@ -888,10 +911,12 @@ static int service_load(Unit *u) { if ((r = unit_load_fragment(u)) < 0) return r; +#ifdef HAVE_SYSV_COMPAT /* Load a classic init script as a fallback, if we couldn't find anything */ if (u->meta.load_state == UNIT_STUB) if ((r = service_load_sysv(s)) < 0) return r; +#endif /* Still nothing found? Then let's give up */ if (u->meta.load_state == UNIT_STUB) @@ -910,8 +935,10 @@ static int service_load(Unit *u) { if ((r = unit_add_default_cgroup(u)) < 0) return r; +#ifdef HAVE_SYSV_COMPAT if ((r = sysv_fix_order(s)) < 0) return r; +#endif if (s->bus_name) if ((r = unit_watch_bus_name(u, s->bus_name)) < 0) @@ -995,6 +1022,7 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { exec_command_dump_list(s->exec_command[c], f, prefix2); } +#ifdef HAVE_SYSV_COMPAT if (s->sysv_path) fprintf(f, "%sSysV Init Script Path: %s\n" @@ -1012,6 +1040,7 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { if (s->sysv_runlevels) fprintf(f, "%sSysVRunLevels: %s\n", prefix, s->sysv_runlevels); +#endif if (s->status_text) fprintf(f, "%sStatus Text: %s\n", @@ -2254,6 +2283,7 @@ static const char *service_sub_state_to_string(Unit *u) { return service_state_to_string(SERVICE(u)->state); } +#ifdef HAVE_SYSV_COMPAT static bool service_check_gc(Unit *u) { Service *s = SERVICE(u); @@ -2261,6 +2291,7 @@ static bool service_check_gc(Unit *u) { return !!s->sysv_path; } +#endif static bool service_check_snapshot(Unit *u) { Service *s = SERVICE(u); @@ -2277,7 +2308,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { assert(s); assert(pid >= 0); - if (s->sysv_path) + if (!s->meta.fragment_path) success = is_clean_exit_lsb(code, status); else success = is_clean_exit(code, status); @@ -2646,6 +2677,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) { unit_add_to_dbus_queue(u); } +#ifdef HAVE_SYSV_COMPAT static int service_enumerate(Manager *m) { char **p; unsigned i; @@ -2655,9 +2687,66 @@ static int service_enumerate(Manager *m) { Unit *service; Iterator j; int r; +#ifdef TARGET_ARCH + Unit *previous = NULL; + char *arch_daemons = NULL; + char *arch_daemons_stripped = NULL; + char **arch_daemons_split = NULL; +#endif assert(m); +#ifdef TARGET_ARCH + if ((r = parse_env_file("/etc/rc.conf", NEWLINE, + "DAEMONS", &arch_daemons, + NULL)) < 0) { + + if (r != -ENOENT) + log_warning("Failed to read /etc/rc.conf: %s", strerror(-r)); + + } else if (arch_daemons) { + if (!(arch_daemons_stripped = strchr(arch_daemons, '('))) + arch_daemons_stripped = arch_daemons; + else + arch_daemons_stripped++; /* strip start paren */ + + arch_daemons_stripped[strcspn(arch_daemons_stripped, ")")] = 0; /* strip end paren */ + + if (!(arch_daemons_split = strv_split_quoted(arch_daemons_stripped))) { + r = -ENOMEM; + goto finish; + } + + STRV_FOREACH(p, arch_daemons_split) { + + free(name); + + if (**p == '!') /* daemons prefixed with ! are disabled, so ignore them */ + continue; + + if (!(name = sysv_translate_name(*p))) { + r = -ENOMEM; + goto finish; + } + + if ((r = manager_load_unit_prepare(m, name, NULL, NULL, &service)) < 0) { + log_warning("Failed to prepare unit %s: %s", name, strerror(-r)); + continue; + } + + if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_WANTS, "multi-user.target", NULL, true)) < 0) + goto finish; + + if (previous) + if ((r = unit_add_dependency(service, UNIT_AFTER, previous, true)) < 0) + goto finish; + + if (**p != '@') /* daemons prefixed with @ can be started in the background */ + previous = service; + } + } +#endif + zero(runlevel_services); STRV_FOREACH(p, m->lookup_paths.sysvrcnd_path) @@ -2795,6 +2884,10 @@ finish: free(path); free(fpath); free(name); +#ifdef TARGET_ARCH + free(arch_daemons); + free(arch_daemons_split); +#endif for (i = 0; i < ELEMENTSOF(rcnd_table); i++) set_free(runlevel_services[i]); @@ -2805,6 +2898,7 @@ finish: return r; } +#endif static void service_bus_name_owner_change( Unit *u, @@ -2988,7 +3082,9 @@ const UnitVTable service_vtable = { .active_state = service_active_state, .sub_state_to_string = service_sub_state_to_string, +#ifdef HAVE_SYSV_COMPAT .check_gc = service_check_gc, +#endif .check_snapshot = service_check_snapshot, .sigchld_event = service_sigchld_event, @@ -3006,5 +3102,7 @@ const UnitVTable service_vtable = { .bus_message_handler = bus_service_message_handler, .bus_invalidating_properties = bus_service_invalidating_properties, +#ifdef HAVE_SYSV_COMPAT .enumerate = service_enumerate +#endif };