diff --git a/0160-mount-when-learning-about-the-root-mount-from-mounti.patch b/0160-mount-when-learning-about-the-root-mount-from-mounti.patch new file mode 100644 index 00000000..eb523ba7 --- /dev/null +++ b/0160-mount-when-learning-about-the-root-mount-from-mounti.patch @@ -0,0 +1,33 @@ +From 602c0e740f8290cc9c4f13f2eb4b23fbbd7a8d2b Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 17 Jun 2013 21:12:53 +0200 +Subject: [PATCH 160/197] mount: when learning about the root mount from + mountinfo, don't add conflicting dep for umount.target + +That way systemd won't try to umount it at shutdown. +--- + src/core/mount.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 10073b5..0ad3d95 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -1538,9 +1538,11 @@ static int mount_add_one( + if (r < 0) + goto fail; + +- r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true); +- if (r < 0) +- goto fail; ++ if (!path_equal(where, "/")) { ++ r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true); ++ if (r < 0) ++ goto fail; ++ } + + unit_add_to_load_queue(u); + } else { +-- +1.8.3.1 + diff --git a/0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch b/0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch new file mode 100644 index 00000000..571d5755 --- /dev/null +++ b/0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch @@ -0,0 +1,34 @@ +From ed002560a1945fb8765c5559c293a19bc9e132d8 Mon Sep 17 00:00:00 2001 +From: Auke Kok +Date: Thu, 20 Jun 2013 13:36:33 -0700 +Subject: [PATCH 185/197] core: only attempt to connect to a session bus if one + likely exists. + +--- + src/core/manager.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/core/manager.c b/src/core/manager.c +index 5c3a2c7..2416dd0 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -509,9 +509,13 @@ int manager_new(SystemdRunningAs running_as, Manager **_m) { + goto fail; + + /* Try to connect to the busses, if possible. */ +- r = bus_init(m, running_as != SYSTEMD_SYSTEM); +- if (r < 0) +- goto fail; ++ if ((running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS")) || ++ running_as == SYSTEMD_SYSTEM) { ++ r = bus_init(m, running_as != SYSTEMD_SYSTEM); ++ if (r < 0) ++ goto fail; ++ } else ++ log_debug("Skipping DBus session bus connection attempt - no DBUS_SESSION_BUS_ADDRESS set..."); + + m->taint_usr = dir_is_empty("/usr") > 0; + +-- +1.8.3.1 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 8a20c41e..7475c095 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 24 00:15:24 UTC 2013 - crrodriguez@opensuse.org + +-0160-mount-when-learning-about-the-root-mount-from-mounti.patch Another case where + we are trying to umount the root directory at shutdown. +-0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch + only attempt to connect to a session bus if one likely exists + ------------------------------------------------------------------- Fri Jun 21 12:40:27 UTC 2013 - rmilasan@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 30a76b85..f083bce2 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -182,7 +182,10 @@ Patch46: 0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch Patch47: 0001-journal-letting-interleaved-seqnums-go.patch # PATCH-FIX-UPSTREAM 0002-journal-remember-last-direction-of-search-and-keep-o.patch crrodriguez@opensuse.org fix journal infinite loops Patch48: 0002-journal-remember-last-direction-of-search-and-keep-o.patch - +# PATCH-FIX-UPSTREAM 0160-mount-when-learning-about-the-root-mount-from-mounti.patch crrodriguez@opensuse.org another case where / is attempted to umount at shutdown +Patch49: 0160-mount-when-learning-about-the-root-mount-from-mounti.patch +# PATCH-FIX-UPSTREAM 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch crrodriguez@opensuse.org only attempt to connect to a session bus if one likely exists. +Patch50: 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch Patch1001: 1001-re-enable-by_path-links-for-ata-devices.patch @@ -422,7 +425,8 @@ cp %{SOURCE7} m4/ %patch46 -p1 %patch47 -p1 %patch48 -p1 - +%patch49 -p1 +%patch50 -p1 # udev patches %patch1001 -p1 %patch1002 -p1 diff --git a/systemd.changes b/systemd.changes index 8a20c41e..7475c095 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 24 00:15:24 UTC 2013 - crrodriguez@opensuse.org + +-0160-mount-when-learning-about-the-root-mount-from-mounti.patch Another case where + we are trying to umount the root directory at shutdown. +-0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch + only attempt to connect to a session bus if one likely exists + ------------------------------------------------------------------- Fri Jun 21 12:40:27 UTC 2013 - rmilasan@suse.com diff --git a/systemd.spec b/systemd.spec index 4cccbb5b..10121ad8 100644 --- a/systemd.spec +++ b/systemd.spec @@ -177,7 +177,10 @@ Patch46: 0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch Patch47: 0001-journal-letting-interleaved-seqnums-go.patch # PATCH-FIX-UPSTREAM 0002-journal-remember-last-direction-of-search-and-keep-o.patch crrodriguez@opensuse.org fix journal infinite loops Patch48: 0002-journal-remember-last-direction-of-search-and-keep-o.patch - +# PATCH-FIX-UPSTREAM 0160-mount-when-learning-about-the-root-mount-from-mounti.patch crrodriguez@opensuse.org another case where / is attempted to umount at shutdown +Patch49: 0160-mount-when-learning-about-the-root-mount-from-mounti.patch +# PATCH-FIX-UPSTREAM 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch crrodriguez@opensuse.org only attempt to connect to a session bus if one likely exists. +Patch50: 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch Patch1001: 1001-re-enable-by_path-links-for-ata-devices.patch @@ -417,7 +420,8 @@ cp %{SOURCE7} m4/ %patch46 -p1 %patch47 -p1 %patch48 -p1 - +%patch49 -p1 +%patch50 -p1 # udev patches %patch1001 -p1 %patch1002 -p1