systemctl: use isolate when called as telinit for a runlevel

diff --git a/src/initctl.c b/src/initctl.c
index 53eac575409298293a702648ae16afbe88888e12..15da4593d0a63648d70885b480085ce6d830e761 100644 (file)
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -119,7 +119,7 @@ static void change_runlevel(Server *s, int runlevel) {
         else
                 mode = "replace";
 
         else
                 mode = "replace";
 

-        log_debug("Running request %s", target);
+        log_debug("Running request %s/start/%s", target, mode);

 
         if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnit"))) {
                 log_error("Could not allocate message.");
 
         if (!(m = dbus_message_new_method_call("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", "StartUnit"))) {
                 log_error("Could not allocate message.");

diff --git a/src/systemctl.c b/src/systemctl.c
index 627b9055aeb9f71eb020568b83db2b0a04fd0d7d..1f93bc974aec3c7002cc7339adc1e5e8bd2a4d4d 100644 (file)
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -1254,7 +1254,11 @@ static int start_unit(DBusConnection *bus, char **args, unsigned n) {
                 method = "StartUnit";
 
                 mode = (arg_action == ACTION_EMERGENCY ||
                 method = "StartUnit";
 
                 mode = (arg_action == ACTION_EMERGENCY ||

-                        arg_action == ACTION_RESCUE) ? "isolate" : "replace";
+                        arg_action == ACTION_RESCUE ||
+                        arg_action == ACTION_RUNLEVEL2 ||
+                        arg_action == ACTION_RUNLEVEL3 ||
+                        arg_action == ACTION_RUNLEVEL4 ||
+                        arg_action == ACTION_RUNLEVEL5) ? "isolate" : "replace";

 
                 one_name = table[arg_action];
         }
 
                 one_name = table[arg_action];
         }