[util-linux/f16] 2.20.1-2.3: fix #813315

[kzak]

commit 0d8315b35b13e9ae8b9a22101659df667a0ee69c
Author: Karel Zak <kzak at redhat.com>
Date:   Tue Apr 17 15:28:58 2012 +0200

    2.20.1-2.3: fix #813315
    
    Signed-off-by: Karel Zak <kzak at redhat.com>

 util-linux-2.20-mount-rec.patch |   32 ++++++++++++++++++++++++++++++++
 util-linux.spec                 |   10 ++++++++--
 2 files changed, 40 insertions(+), 2 deletions(-)
---
diff --git a/util-linux-2.20-mount-rec.patch b/util-linux-2.20-mount-rec.patch
new file mode 100644
index 0000000..6a4483a
--- /dev/null
+++ b/util-linux-2.20-mount-rec.patch
@@ -0,0 +1,32 @@
+diff -up util-linux-2.20.1/libmount/src/context_mount.c.kzak util-linux-2.20.1/libmount/src/context_mount.c
+--- util-linux-2.20.1/libmount/src/context_mount.c.kzak	2011-10-18 14:22:27.000000000 +0200
++++ util-linux-2.20.1/libmount/src/context_mount.c	2012-04-17 15:25:14.273287922 +0200
+@@ -46,9 +46,10 @@ static int fix_optstr(struct libmnt_cont
+ 
+ 	fs = cxt->fs;
+ 
+-	/* The propagation flags should not be used together with any other flags */
++	/* The propagation flags should not be used together with any other
++	 * flags (except MS_REC and MS_SILENT) */
+ 	if (cxt->mountflags & MS_PROPAGATION)
+-		cxt->mountflags &= MS_PROPAGATION;
++		cxt->mountflags &= (MS_PROPAGATION | MS_REC | MS_SILENT);
+ 
+ 	if (!mnt_optstr_get_option(fs->user_optstr, "user", &val, &valsz)) {
+ 		if (val) {
+diff -up util-linux-2.20.1/mount/mount.c.kzak util-linux-2.20.1/mount/mount.c
+--- util-linux-2.20.1/mount/mount.c.kzak	2012-04-17 15:24:52.817199995 +0200
++++ util-linux-2.20.1/mount/mount.c	2012-04-17 15:25:14.274287916 +0200
+@@ -586,9 +586,10 @@ parse_opts (const char *options, int *fl
+ 
+ 	*flags |= mounttype;
+ 
+-	/* The propagation flags should not be used together with any other flags */
++	/* The propagation flags should not be used together with any
++	 * other flags (except MS_REC and MS_SILENT) */
+ 	if (*flags & MS_PROPAGATION)
+-		*flags &= MS_PROPAGATION;
++		*flags &= (MS_PROPAGATION | MS_REC | MS_SILENT);
+ }
+ 
+ /* Try to build a canonical options string.  */
diff --git a/util-linux.spec b/util-linux.spec
index 54654b5..c5bdef5 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux
 Version: 2.20.1
-Release: 2.2%{?dist}
+Release: 2.3%{?dist}
 License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: http://kernel.org/~kzak/util-linux/
@@ -94,6 +94,8 @@ Patch10: util-linux-2.20-mount.patch
 Patch11: util-linux-2.20-logger.patch
 # 747038 - Mount does not handle context mount correctly
 Patch12: util-linux-2.20-mount-hint.patch
+# 813315 - recursive propagation mounts are not recursive
+Patch13: util-linux-2.20-mount-rec.patch
 
 %description
 The util-linux package contains a large variety of low-level system
@@ -212,7 +214,8 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
- 
+%patch13 -p1
+
 %build
 unset LINGUAS || :
 
@@ -760,6 +763,9 @@ fi
 
 
 %changelog
+* Tue Apr 17 2012 Karel Zak <kzak at redhat.com> 2.20.1-2.3
+- fix #813315 - recursive propagation mounts are not recursive
+
 * Thu Jan 19 2012 Michal Luscon <mluscon at redhat.com> 2.20.1-2.2
 - fix #747250 - /run shows up twice in /proc/mounts
 - fix #769636 - systemd NFS Mounts Ignore "exec" Flag