From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 24 Sep 2015 09:54:15 +0000 (+0200)
Subject: systemctl: don't special case ACTION_RUNLEVEL anymore
X-Git-Tag: v227~62^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f16c1f479ac3d790933ca196075cba333bab387;p=thirdparty%2Fsystemd.git

systemctl: don't special case ACTION_RUNLEVEL anymore

Let's move its dispatching to the main switch statement.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 4de01d91d1d..fe71d059fc1 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -266,6 +266,11 @@ static void warn_wall(enum action a) {
 
 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)
                 return true;
 
@@ -7574,13 +7579,6 @@ int main(int argc, char*argv[]) {
         if (r <= 0)
                 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) {
                 log_info("Running in chroot, ignoring request.");
                 r = 0;
@@ -7654,6 +7652,9 @@ int main(int argc, char*argv[]) {
         }
 
         case ACTION_RUNLEVEL:
+                r = runlevel_main();
+                break;
+
         case _ACTION_INVALID:
         default:
                 assert_not_reached("Unknown action");