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/shared | |
| 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/shared')
| -rw-r--r-- | src/shared/special.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/shared/special.h b/src/shared/special.h index b045047d36..e51310eb6d 100644 --- a/src/shared/special.h +++ b/src/shared/special.h @@ -42,6 +42,8 @@ /* Special boot targets */ #define SPECIAL_RESCUE_TARGET "rescue.target" #define SPECIAL_EMERGENCY_TARGET "emergency.target" +#define SPECIAL_MULTI_USER_TARGET "multi-user.target" +#define SPECIAL_GRAPHICAL_TARGET "graphical.target" /* Early boot targets */ #define SPECIAL_SYSINIT_TARGET "sysinit.target" @@ -108,13 +110,6 @@ #define SPECIAL_SIGPWR_TARGET "sigpwr.target" #define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.target" -/* For SysV compatibility. Usually an alias for a saner target. On - * SysV-free systems this doesn't exist. */ -#define SPECIAL_RUNLEVEL2_TARGET "runlevel2.target" -#define SPECIAL_RUNLEVEL3_TARGET "runlevel3.target" -#define SPECIAL_RUNLEVEL4_TARGET "runlevel4.target" -#define SPECIAL_RUNLEVEL5_TARGET "runlevel5.target" - /* Where we add all our system units, users and machines by default */ #define SPECIAL_SYSTEM_SLICE "system.slice" #define SPECIAL_USER_SLICE "user.slice" |