pool/systemd
SHA256
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 156091 from Base:System

Browse Source 
- 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
This commit is contained in:
Stephan Kulow 2013-02-22 16:23:15 +00:00 committed by Git OBS Bridge
parent 96aa32bb59
commit 33265be215
5 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
rbind-mount.patch Normal file
View File

@ -0,0 +1,47 @@
From df77b11852d6b3495848c4123e7cbd9f099910f9 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
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

6
systemd-mini.changes
View File

@ -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

3
systemd-mini.spec
View File

@ -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

6
systemd.changes
View File

@ -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

3
systemd.spec
View File

@ -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