shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

everywhere: remove configurability of sysv runlevel to target mapping

Browse Source 
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.
This commit is contained in:
Lennart Poettering 2015-02-18 20:17:49 +01:00
parent ac49d36fae
commit d5d8429a12
7 changed files with 34 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile.am
View File

@ -242,14 +242,11 @@ endef
INSTALL_DIRS = INSTALL_DIRS =
RUNLEVEL1_TARGET_WANTS =
RUNLEVEL2_TARGET_WANTS =
RUNLEVEL3_TARGET_WANTS =
RUNLEVEL4_TARGET_WANTS =
RUNLEVEL5_TARGET_WANTS =
SHUTDOWN_TARGET_WANTS = SHUTDOWN_TARGET_WANTS =
LOCAL_FS_TARGET_WANTS = LOCAL_FS_TARGET_WANTS =
MULTI_USER_TARGET_WANTS = MULTI_USER_TARGET_WANTS =
GRAPHICAL_TARGET_WANTS =
RESCUE_TARGET_WANTS =
SYSINIT_TARGET_WANTS = SYSINIT_TARGET_WANTS =
SOCKETS_TARGET_WANTS = SOCKETS_TARGET_WANTS =
BUSNAMES_TARGET_WANTS = BUSNAMES_TARGET_WANTS =
@ -263,14 +260,11 @@ USER_UNIT_ALIASES =
GENERAL_ALIASES = GENERAL_ALIASES =
install-target-wants-hook: install-target-wants-hook:
what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && dir=$(systemunitdir) && $(add-wants)
what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && dir=$(systemunitdir) && $(add-wants)
what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && dir=$(systemunitdir) && $(add-wants)
what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && dir=$(systemunitdir) && $(add-wants)
what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && dir=$(systemunitdir) && $(add-wants)
what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants) what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants)
what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants) what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants)
what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants) what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && dir=$(systemunitdir) && $(add-wants)
what="$(RESCUE_TARGET_WANTS)" && wants=rescue.target && dir=$(systemunitdir) && $(add-wants)
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants) what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants) what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants) what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
@ -6572,15 +6566,11 @@ SOCKETS_TARGET_WANTS += \
if HAVE_UTMP if HAVE_UTMP
if HAVE_SYSV_COMPAT if HAVE_SYSV_COMPAT
RUNLEVEL1_TARGET_WANTS += \ MULTI_USER_TARGET_WANTS += \
systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service
RUNLEVEL2_TARGET_WANTS += \ GRAPHICAL_TARGET_WANTS += \
systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service
RUNLEVEL3_TARGET_WANTS += \ RESCUE_TARGET_WANTS += \
systemd-update-utmp-runlevel.service
RUNLEVEL4_TARGET_WANTS += \
systemd-update-utmp-runlevel.service
RUNLEVEL5_TARGET_WANTS += \
systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service
endif endif

8
src/core/main.c
View File

@ -280,10 +280,10 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
"s", SPECIAL_RESCUE_TARGET, "s", SPECIAL_RESCUE_TARGET,
"S", SPECIAL_RESCUE_TARGET, "S", SPECIAL_RESCUE_TARGET,
"1", SPECIAL_RESCUE_TARGET, "1", SPECIAL_RESCUE_TARGET,
"2", SPECIAL_RUNLEVEL2_TARGET, "2", SPECIAL_MULTI_USER_TARGET,
"3", SPECIAL_RUNLEVEL3_TARGET, "3", SPECIAL_MULTI_USER_TARGET,
"4", SPECIAL_RUNLEVEL4_TARGET, "4", SPECIAL_MULTI_USER_TARGET,
"5", SPECIAL_RUNLEVEL5_TARGET, "5", SPECIAL_GRAPHICAL_TARGET,
}; };
int r; int r;

18
src/initctl/initctl.c
View File

@ -78,15 +78,15 @@ static const char *translate_runlevel(int runlevel, bool *isolate) {
const char *special; const char *special;
bool isolate; bool isolate;
} table[] = { } table[] = {
{ '0', SPECIAL_POWEROFF_TARGET, false }, { '0', SPECIAL_POWEROFF_TARGET, false },
{ '1', SPECIAL_RESCUE_TARGET, true }, { '1', SPECIAL_RESCUE_TARGET, true },
{ 's', SPECIAL_RESCUE_TARGET, true }, { 's', SPECIAL_RESCUE_TARGET, true },
{ 'S', SPECIAL_RESCUE_TARGET, true }, { 'S', SPECIAL_RESCUE_TARGET, true },
{ '2', SPECIAL_RUNLEVEL2_TARGET, true }, { '2', SPECIAL_MULTI_USER_TARGET, true },
{ '3', SPECIAL_RUNLEVEL3_TARGET, true }, { '3', SPECIAL_MULTI_USER_TARGET, true },
{ '4', SPECIAL_RUNLEVEL4_TARGET, true }, { '4', SPECIAL_MULTI_USER_TARGET, true },
{ '5', SPECIAL_RUNLEVEL5_TARGET, true }, { '5', SPECIAL_GRAPHICAL_TARGET, true },
{ '6', SPECIAL_REBOOT_TARGET, false }, { '6', SPECIAL_REBOOT_TARGET, false },
}; };
unsigned i; unsigned i;

9
src/shared/special.h
View File

@ -42,6 +42,8 @@
/* Special boot targets */ /* Special boot targets */
#define SPECIAL_RESCUE_TARGET "rescue.target" #define SPECIAL_RESCUE_TARGET "rescue.target"
#define SPECIAL_EMERGENCY_TARGET "emergency.target" #define SPECIAL_EMERGENCY_TARGET "emergency.target"
#define SPECIAL_MULTI_USER_TARGET "multi-user.target"
#define SPECIAL_GRAPHICAL_TARGET "graphical.target"
/* Early boot targets */ /* Early boot targets */
#define SPECIAL_SYSINIT_TARGET "sysinit.target" #define SPECIAL_SYSINIT_TARGET "sysinit.target"
@ -108,13 +110,6 @@
#define SPECIAL_SIGPWR_TARGET "sigpwr.target" #define SPECIAL_SIGPWR_TARGET "sigpwr.target"
#define SPECIAL_CTRL_ALT_DEL_TARGET "ctrl-alt-del.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 */ /* Where we add all our system units, users and machines by default */
#define SPECIAL_SYSTEM_SLICE "system.slice" #define SPECIAL_SYSTEM_SLICE "system.slice"
#define SPECIAL_USER_SLICE "user.slice" #define SPECIAL_USER_SLICE "user.slice"

8
src/systemctl/systemctl.c
View File

@ -2650,10 +2650,10 @@ static const struct {
[ACTION_POWEROFF] = { SPECIAL_POWEROFF_TARGET, "poweroff", "replace-irreversibly" }, [ACTION_POWEROFF] = { SPECIAL_POWEROFF_TARGET, "poweroff", "replace-irreversibly" },
[ACTION_REBOOT] = { SPECIAL_REBOOT_TARGET, "reboot", "replace-irreversibly" }, [ACTION_REBOOT] = { SPECIAL_REBOOT_TARGET, "reboot", "replace-irreversibly" },
[ACTION_KEXEC] = { SPECIAL_KEXEC_TARGET, "kexec", "replace-irreversibly" }, [ACTION_KEXEC] = { SPECIAL_KEXEC_TARGET, "kexec", "replace-irreversibly" },
[ACTION_RUNLEVEL2] = { SPECIAL_RUNLEVEL2_TARGET, NULL, "isolate" }, [ACTION_RUNLEVEL2] = { SPECIAL_MULTI_USER_TARGET, NULL, "isolate" },
[ACTION_RUNLEVEL3] = { SPECIAL_RUNLEVEL3_TARGET, NULL, "isolate" }, [ACTION_RUNLEVEL3] = { SPECIAL_MULTI_USER_TARGET, NULL, "isolate" },
[ACTION_RUNLEVEL4] = { SPECIAL_RUNLEVEL4_TARGET, NULL, "isolate" }, [ACTION_RUNLEVEL4] = { SPECIAL_MULTI_USER_TARGET, NULL, "isolate" },
[ACTION_RUNLEVEL5] = { SPECIAL_RUNLEVEL5_TARGET, NULL, "isolate" }, [ACTION_RUNLEVEL5] = { SPECIAL_GRAPHICAL_TARGET, NULL, "isolate" },
[ACTION_RESCUE] = { SPECIAL_RESCUE_TARGET, "rescue", "isolate" }, [ACTION_RESCUE] = { SPECIAL_RESCUE_TARGET, "rescue", "isolate" },
[ACTION_EMERGENCY] = { SPECIAL_EMERGENCY_TARGET, "emergency", "isolate" }, [ACTION_EMERGENCY] = { SPECIAL_EMERGENCY_TARGET, "emergency", "isolate" },
[ACTION_DEFAULT] = { SPECIAL_DEFAULT_TARGET, "default", "isolate" }, [ACTION_DEFAULT] = { SPECIAL_DEFAULT_TARGET, "default", "isolate" },

10
src/sysv-generator/sysv-generator.c
View File

@ -51,11 +51,11 @@ static const struct {
const RunlevelType type; const RunlevelType type;
} rcnd_table[] = { } rcnd_table[] = {
/* Standard SysV runlevels for start-up */ /* Standard SysV runlevels for start-up */
{ "rc1.d", SPECIAL_RESCUE_TARGET, RUNLEVEL_UP }, { "rc1.d", SPECIAL_RESCUE_TARGET, RUNLEVEL_UP },
{ "rc2.d", SPECIAL_RUNLEVEL2_TARGET, RUNLEVEL_UP }, { "rc2.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
{ "rc3.d", SPECIAL_RUNLEVEL3_TARGET, RUNLEVEL_UP }, { "rc3.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
{ "rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP }, { "rc4.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
{ "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP }, { "rc5.d", SPECIAL_GRAPHICAL_TARGET, RUNLEVEL_UP },
/* Standard SysV runlevels for shutdown */ /* Standard SysV runlevels for shutdown */
{ "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN }, { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN },

8
src/update-utmp/update-utmp.c
View File

@ -80,11 +80,9 @@ static int get_current_runlevel(Context *c) {
* here over the others, since these are the main * here over the others, since these are the main
* runlevels used on Fedora. It might make sense to * runlevels used on Fedora. It might make sense to
* change the order on some distributions. */ * change the order on some distributions. */
{ '5', SPECIAL_RUNLEVEL5_TARGET }, { '5', SPECIAL_GRAPHICAL_TARGET },
{ '3', SPECIAL_RUNLEVEL3_TARGET }, { '3', SPECIAL_MULTI_USER_TARGET },
{ '4', SPECIAL_RUNLEVEL4_TARGET }, { '1', SPECIAL_RESCUE_TARGET },
{ '2', SPECIAL_RUNLEVEL2_TARGET },
{ '1', SPECIAL_RESCUE_TARGET },
}; };
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;