From 33265be21585e5433f0d9beafe6dda192991345de3bc5e14286d1bbe02f6c192 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 22 Feb 2013 16:23:15 +0000 Subject: [PATCH] Accepting request 156091 from Base:System - Add rbind-mount.patch: handle rbind mount points correctly (bnc#804575). (forwarded request 156080 from fcrozat) OBS-URL: https://build.opensuse.org/request/show/156091 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=133 --- rbind-mount.patch | 47 ++++++++++++++++++++++++++++++++++++++++++++ systemd-mini.changes | 6 ++++++ systemd-mini.spec | 3 +++ systemd.changes | 6 ++++++ systemd.spec | 3 +++ 5 files changed, 65 insertions(+) create mode 100644 rbind-mount.patch diff --git a/rbind-mount.patch b/rbind-mount.patch new file mode 100644 index 00000000..c2eb6b4f --- /dev/null +++ b/rbind-mount.patch @@ -0,0 +1,47 @@ +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 + diff --git a/systemd-mini.changes b/systemd-mini.changes index dfca29b1..bad5b461 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 21 14:45:12 UTC 2013 - fcrozat@suse.com + +- Add rbind-mount.patch: handle rbind mount points correctly + (bnc#804575). + ------------------------------------------------------------------- Tue Feb 19 11:20:31 CET 2013 - fcrozat@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 61f18349..f8e9e65e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -280,6 +280,8 @@ Patch132: improve-journal-perf.patch 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 @@ cp %{SOURCE7} m4/ %patch132 -p1 %patch133 -p1 %patch134 -p1 +%patch135 -p1 %build autoreconf -fiv diff --git a/systemd.changes b/systemd.changes index dfca29b1..bad5b461 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 21 14:45:12 UTC 2013 - fcrozat@suse.com + +- Add rbind-mount.patch: handle rbind mount points correctly + (bnc#804575). + ------------------------------------------------------------------- Tue Feb 19 11:20:31 CET 2013 - fcrozat@suse.com diff --git a/systemd.spec b/systemd.spec index eb88b5b7..8ad72466 100644 --- a/systemd.spec +++ b/systemd.spec @@ -275,6 +275,8 @@ Patch132: improve-journal-perf.patch 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 @@ -610,6 +612,7 @@ cp %{SOURCE7} m4/ %patch132 -p1 %patch133 -p1 %patch134 -p1 +%patch135 -p1 %build autoreconf -fiv