[systemd-commits] 2 commits - Makefile.am configure.ac src/core

[Lennart Poettering]

 Makefile.am     |    8 ++++----
 configure.ac    |    2 +-
 src/core/main.c |   15 +++++++++++++--
 3 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit ab17a050b778412b11c82f4fa974be9c491ead36
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Mar 7 22:18:34 2013 +0100

    core: if we cannot JOB_ISOLATE the default target JOB_REPLACE it instead
    
    In order to maintain compatibility with older initrds which do not have
    AllowIsolate=yes set for their target units, fallback to JOB_REPLACE if
    JOB_ISOLATE doesn't work, but complain about it.

diff --git a/src/core/main.c b/src/core/main.c
index 727a410..7b03983 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1736,11 +1736,22 @@ int main(int argc, char *argv[]) {
                 }
 
                 r = manager_add_job(m, JOB_START, target, JOB_ISOLATE, false, &error, &default_unit_job);
-                if (r < 0) {
-                        log_error("Failed to start default target: %s", bus_error(&error, r));
+                if (r == -EPERM) {
+                        log_error("Default target could not be isolated, starting instead: %s", bus_error(&error, r));
+                        dbus_error_free(&error);
+
+                        r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &error, &default_unit_job);
+                        if (r < 0) {
+                                log_error("Failed to start default target: %s", bus_error(&error, r));
+                                dbus_error_free(&error);
+                                goto finish;
+                        }
+                } else if (r < 0) {
+                        log_error("Failed to isolate default target: %s", bus_error(&error, r));
                         dbus_error_free(&error);
                         goto finish;
                 }
+
                 m->default_unit_job_id = default_unit_job->id;
 
                 after_startup = now(CLOCK_MONOTONIC);

commit 01ec23582dc0523831059fc05bedde16efd06576
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Mar 7 21:53:53 2013 +0100

    build-sys: bump release and sonames

diff --git a/Makefile.am b/Makefile.am
index c1c8cdb..05bf582 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,16 +32,16 @@ SUBDIRS = . po
 .SECONDARY:
 
 LIBUDEV_CURRENT=3
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
 LIBUDEV_AGE=2
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=11
-LIBSYSTEMD_LOGIN_AGE=3
+LIBSYSTEMD_LOGIN_CURRENT=4
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=4
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=7
diff --git a/configure.ac b/configure.ac
index 43b8225..28d7286 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([systemd],
-        [197],
+        [198],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=systemd],
         [systemd],
         [http://www.freedesktop.org/wiki/Software/systemd])