shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

systemctl: don't special case ACTION_RUNLEVEL anymore

Browse Source 
Let's move its dispatching to the main switch statement.
This commit is contained in:
Lennart Poettering 2015-09-24 11:54:15 +02:00
parent f2d11d35e9
commit 4f16c1f479
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/systemctl/systemctl.c
View File

@ -266,6 +266,11 @@ static void warn_wall(enum action a) {
static bool avoid_bus(void) { static bool avoid_bus(void) {
/* /sbin/runlevel doesn't need to communicate via D-Bus, so
* let's shortcut this */
if (arg_action == ACTION_RUNLEVEL)
return true;
if (running_in_chroot() > 0) if (running_in_chroot() > 0)
return true; return true;
@ -7574,13 +7579,6 @@ int main(int argc, char*argv[]) {
if (r <= 0) if (r <= 0)
goto finish; goto finish;
/* /sbin/runlevel doesn't need to communicate via D-Bus, so
* let's shortcut this */
if (arg_action == ACTION_RUNLEVEL) {
r = runlevel_main();
goto finish;
}
if (running_in_chroot() > 0 && arg_action != ACTION_SYSTEMCTL) { if (running_in_chroot() > 0 && arg_action != ACTION_SYSTEMCTL) {
log_info("Running in chroot, ignoring request."); log_info("Running in chroot, ignoring request.");
r = 0; r = 0;
@ -7654,6 +7652,9 @@ int main(int argc, char*argv[]) {
} }
case ACTION_RUNLEVEL: case ACTION_RUNLEVEL:
r = runlevel_main();
break;
case _ACTION_INVALID: case _ACTION_INVALID:
default: default:
assert_not_reached("Unknown action"); assert_not_reached("Unknown action");