commit systemd for openSUSE:12.3

Hello community, here is the log from the commit of package systemd for openSUSE:12.3 checked in at 2013-02-22 17:23:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/systemd (Old) and /work/SRC/openSUSE:12.3/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/systemd/systemd-mini.changes 2013-02-20 17:46:39.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.systemd.new/systemd-mini.changes 2013-02-22 17:23:27.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 21 14:45:12 UTC 2013 - fcrozat@suse.com + +- Add rbind-mount.patch: handle rbind mount points correctly + (bnc#804575). + +------------------------------------------------------------------- systemd.changes: same change New: ---- rbind-mount.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.b32Zeb/_old 2013-02-22 17:23:29.000000000 +0100 +++ /var/tmp/diff_new_pack.b32Zeb/_new 2013-02-22 17:23:29.000000000 +0100 @@ -280,6 +280,8 @@ Patch133: support-hybrid-suspend.patch # PATCH-FIX-OPENSUSE forward-to-pmutils.patch fcrozat@suse.com bnc#790157 -- forward to pm-utils Patch134: forward-to-pmutils.patch +# PATCH-FIX-UPSTREAM rbind-mount.patch fcrozat@suse.com bnc#804575 -- Handle rbind mount point correctly +Patch135: rbind-mount.patch # udev patches # PATCH-FIX-OPENSUSE 1001-Reinstate-TIMEOUT-handling.patch @@ -615,6 +617,7 @@ %patch132 -p1 %patch133 -p1 %patch134 -p1 +%patch135 -p1 %build autoreconf -fiv systemd.spec: same change ++++++ rbind-mount.patch ++++++

From df77b11852d6b3495848c4123e7cbd9f099910f9 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Thu, 21 Feb 2013 15:40:52 +0100 Subject: [PATCH] detect rbind as bind mount

Correctly detect rbind mount option as bind mount. Fixes https://bugzilla.novell.com/show_bug.cgi?id=804575. --- src/core/mount.c | 6 ++++++ src/fstab-generator/fstab-generator.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/core/mount.c b/src/core/mount.c index e3d298e..419cf27 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -329,6 +329,12 @@ static bool mount_is_bind(MountParameters *p) { if (p->fstype && streq(p->fstype, "bind")) return true; + if (mount_test_option(p->options, "rbind")) + return true; + + if (p->fstype && streq(p->fstype, "rbind")) + return true; + return false; } diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c index bfedded..9db4123 100644 --- a/src/fstab-generator/fstab-generator.c +++ b/src/fstab-generator/fstab-generator.c @@ -178,7 +178,9 @@ static bool mount_is_bind(struct mntent *me) { return hasmntopt(me, "bind") || - streq(me->mnt_type, "bind"); + streq(me->mnt_type, "bind") || + hasmntopt(me, "rbind") || + streq(me->mnt_type, "rbind"); } static bool mount_is_network(struct mntent *me) { -- 1.8.1.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org