[systemd-commits] 3 commits - configure.ac src/initctl.c src/manager.c src/systemctl.c

[Lennart Poettering]

 configure.ac    |    2 +-
 src/initctl.c   |    2 +-
 src/manager.c   |    2 +-
 src/systemctl.c |    6 +++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 6f890469f4329900a88459d9bf43d36837f61808
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Sep 14 02:29:58 2010 +0200

    build-sys: bump version

diff --git a/configure.ac b/configure.ac
index ba9bbf8..2ff0c1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 
 AC_PREREQ(2.63)
 
-AC_INIT([systemd],[9],[systemd-devel at lists.freedesktop.org])
+AC_INIT([systemd],[10],[systemd-devel at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
commit 6f0d624ec785409ad82c2e3afb786d977f2b1c87
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Sep 14 02:22:55 2010 +0200

    systemctl: use isolate when called as telinit for a runlevel

diff --git a/src/initctl.c b/src/initctl.c
index 53eac57..15da459 100644
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -119,7 +119,7 @@ static void change_runlevel(Server *s, int runlevel) {
         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.");
diff --git a/src/systemctl.c b/src/systemctl.c
index 627b905..1f93bc9 100644
--- 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 ||
-                        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];
         }
commit e43ac8788b340a5d01c9c7e4c93c70d6b06a316d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Sep 14 02:16:14 2010 +0200

    manager: log job mode when running job

diff --git a/src/manager.c b/src/manager.c
index 3a0ba48..27c8aa4 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -1535,7 +1535,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove
                 return -EPERM;
         }
 
-        log_debug("Trying to enqueue job %s/%s", unit->meta.id, job_type_to_string(type));
+        log_debug("Trying to enqueue job %s/%s/%s", unit->meta.id, job_type_to_string(type), job_mode_to_string(mode));
 
         if ((r = transaction_add_job_and_dependencies(m, type, unit, NULL, true, override, false, e, &ret)) < 0) {
                 transaction_abort(m);