diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-02-18 20:17:49 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-02-18 20:20:14 +0100 |
| commit | d5d8429a12c4b1ef0dcd226c0904f00f4fa4898a (patch) | |
| tree | fe51dbfdc85d449e740bb7c673a24a78882360f2 /src/initctl/initctl.c | |
| parent | ac49d36faef5739d0e9db5742b780c4fb88e68bf (diff) | |
everywhere: remove configurability of sysv runlevel to target mapping
With this change runlevel 2, 3, 4 are mapped to multi-user.target for
good, and 5 to graphical.target. This was already the previous mapping
but is now no longer reconfigurable, but hard-coded into the core.
This should generally simplify things, but also fix one bug: the
sysv-generator previously generated symlinks to runlevel[2-5].target
units, which possibly weren't picked up if these aliases were otherwise
only referenced by the real names "multi-user.target" and
"graphical.target".
We keep compat aliases "runlevel[2345].target" arround for cases where
this target name is explicitly requested.
Diffstat (limited to 'src/initctl/initctl.c')
| -rw-r--r-- | src/initctl/initctl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c index 7a6a383b32..8b632e88ae 100644 --- a/src/initctl/initctl.c +++ b/src/initctl/initctl.c @@ -78,15 +78,15 @@ static const char *translate_runlevel(int runlevel, bool *isolate) { const char *special; bool isolate; } table[] = { - { '0', SPECIAL_POWEROFF_TARGET, false }, - { '1', SPECIAL_RESCUE_TARGET, true }, - { 's', SPECIAL_RESCUE_TARGET, true }, - { 'S', SPECIAL_RESCUE_TARGET, true }, - { '2', SPECIAL_RUNLEVEL2_TARGET, true }, - { '3', SPECIAL_RUNLEVEL3_TARGET, true }, - { '4', SPECIAL_RUNLEVEL4_TARGET, true }, - { '5', SPECIAL_RUNLEVEL5_TARGET, true }, - { '6', SPECIAL_REBOOT_TARGET, false }, + { '0', SPECIAL_POWEROFF_TARGET, false }, + { '1', SPECIAL_RESCUE_TARGET, true }, + { 's', SPECIAL_RESCUE_TARGET, true }, + { 'S', SPECIAL_RESCUE_TARGET, true }, + { '2', SPECIAL_MULTI_USER_TARGET, true }, + { '3', SPECIAL_MULTI_USER_TARGET, true }, + { '4', SPECIAL_MULTI_USER_TARGET, true }, + { '5', SPECIAL_GRAPHICAL_TARGET, true }, + { '6', SPECIAL_REBOOT_TARGET, false }, }; unsigned i; |