Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked
in at 2013-06-25 17:20:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2013-06-24
09:46:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes
2013-06-25 17:24:45.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Jun 24 00:15:24 UTC 2013 - crrodrig...@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
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2013-06-24
09:46:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2013-06-25
17:24:45.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Jun 24 00:15:24 UTC 2013 - crrodrig...@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
+
+-------------------------------------------------------------------
New:
----
0160-mount-when-learning-about-the-root-mount-from-mounti.patch
0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd-mini.spec ++++++
--- /var/tmp/diff_new_pack.Dn9xdA/_old 2013-06-25 17:24:46.000000000 +0200
+++ /var/tmp/diff_new_pack.Dn9xdA/_new 2013-06-25 17:24:46.000000000 +0200
@@ -182,7 +182,10 @@
Patch47: 0001-journal-letting-interleaved-seqnums-go.patch
# PATCH-FIX-UPSTREAM
0002-journal-remember-last-direction-of-search-and-keep-o.patch
crrodrig...@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
crrodrig...@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
crrodrig...@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 @@
%patch46 -p1
%patch47 -p1
%patch48 -p1
-
+%patch49 -p1
+%patch50 -p1
# udev patches
%patch1001 -p1
%patch1002 -p1
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.Dn9xdA/_old 2013-06-25 17:24:46.000000000 +0200
+++ /var/tmp/diff_new_pack.Dn9xdA/_new 2013-06-25 17:24:46.000000000 +0200
@@ -177,7 +177,10 @@
Patch47: 0001-journal-letting-interleaved-seqnums-go.patch
# PATCH-FIX-UPSTREAM
0002-journal-remember-last-direction-of-search-and-keep-o.patch
crrodrig...@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
crrodrig...@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
crrodrig...@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 @@
%patch46 -p1
%patch47 -p1
%patch48 -p1
-
+%patch49 -p1
+%patch50 -p1
# udev patches
%patch1001 -p1
%patch1002 -p1
++++++ 0160-mount-when-learning-about-the-root-mount-from-mounti.patch ++++++
>From 602c0e740f8290cc9c4f13f2eb4b23fbbd7a8d2b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lenn...@poettering.net>
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
++++++ 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch ++++++
>From ed002560a1945fb8765c5559c293a19bc9e132d8 Mon Sep 17 00:00:00 2001
From: Auke Kok <auke-jan.h....@intel.com>
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
