diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-06-07 02:42:01 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-06-07 02:42:01 +0200 |
| commit | fc5df99e247b1bea9834b1e1e7b69ec6f955411e (patch) | |
| tree | 3e636dded9c3040c76aae3f9256beb6f3f688d3c /src | |
| parent | dfd8eeed3911ce1a4ffc51b9c444f3f18d545040 (diff) | |
service: honour suse style Kxx links in boot.d/ directory
Diffstat (limited to 'src')
| -rw-r--r-- | src/service.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/service.c b/src/service.c index 8b1fab785..651f7c82c 100644 --- a/src/service.c +++ b/src/service.c @@ -40,7 +40,7 @@ typedef enum RunlevelType { RUNLEVEL_UP, RUNLEVEL_DOWN, - RUNLEVEL_BASIC + RUNLEVEL_SYSINIT } RunlevelType; static const struct { @@ -58,10 +58,10 @@ static const struct { { "rc6.d", SPECIAL_RUNLEVEL6_TARGET, RUNLEVEL_DOWN }, /* SUSE style boot.d */ - { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_BASIC }, + { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, /* Debian style rcS.d */ - { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_BASIC }, + { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, }; #define RUNLEVELS_UP "12345" @@ -2268,7 +2268,7 @@ static int service_enumerate(Manager *m) { } if (de->d_name[0] == 'S' && - (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_BASIC)) + (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT)) SERVICE(service)->sysv_start_priority = MAX(a*10 + b, SERVICE(service)->sysv_start_priority); @@ -2287,7 +2287,9 @@ static int service_enumerate(Manager *m) { if ((r = unit_add_dependency(service, UNIT_BEFORE, runlevel_target, true)) < 0) goto finish; - } else if (de->d_name[0] == 'K' && rcnd_table[i].type == RUNLEVEL_DOWN) { + } else if (de->d_name[0] == 'K' && + (rcnd_table[i].type == RUNLEVEL_DOWN || + rcnd_table[i].type == RUNLEVEL_SYSINIT)) { Unit *shutdown_target; /* We honour K links only for @@ -2299,7 +2301,12 @@ static int service_enumerate(Manager *m) { * really distuingish here * between the runlevels 0 and * 6 and just add them to the - * special shutdown target. */ + * special shutdown target. On + * SUSE the boot.d/ runlevel + * is also used for shutdown, + * so we add links for that + * too to the shutdown + * target.*/ if ((r = manager_load_unit(m, SPECIAL_SHUTDOWN_TARGET, NULL, &shutdown_target)) < 0) goto finish; |