rpms/util-linux-ng/F-12 mount.tmpfs, 1.3, 1.4 util-linux-ng.spec, 1.71, 1.72

[kzak]

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24279

Modified Files:
	mount.tmpfs util-linux-ng.spec 
Log Message:
* Mon Apr 12 2010 Karel Zak <kzak at redhat.com> 2.16.2-8
- fix #581252 - remounting tmpfs fails because of hidden rootcontext=



Index: mount.tmpfs
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/mount.tmpfs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mount.tmpfs	20 Mar 2009 09:13:48 -0000	1.3
+++ mount.tmpfs	12 Apr 2010 13:53:52 -0000	1.4
@@ -10,11 +10,18 @@
 # /sbin/mount.tmpfs spec dir [-sfnv] [-o options]
 #
 
-if ! echo "$@" | grep -q -E '(fs|def|root)?context='; then
-  con=$(ls --scontext -d "$2" | cut -f 1 -d ' ')
-  if [ -n "$con" ] && [ "$con" != "?" ] && [ "$con" != "unlabeled" ]; then 
+# Remount with context mount options is unsupported
+# http://bugzilla.redhat.com/show_bug.cgi?id=563267
+#
+if ! echo "$@" | grep -q -E '\-o.*remount';  then
+
+  if ! echo "$@" | grep -q -E '(fs|def|root)?context='; then
+    con=$(ls --scontext -d "$2" | cut -f 1 -d ' ')
+    if [ -n "$con" ] && [ "$con" != "?" ] && [ "$con" != "unlabeled" ]; then 
       exec /bin/mount "$@" -o "rootcontext=\"$con\"" -i -t tmpfs
+    fi
   fi
+
 fi
 
 exec /bin/mount "$@" -i -t tmpfs


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/F-12/util-linux-ng.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- util-linux-ng.spec	8 Mar 2010 12:19:54 -0000	1.71
+++ util-linux-ng.spec	12 Apr 2010 13:53:52 -0000	1.72
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.16.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -728,6 +728,9 @@ fi
 
 
 %changelog
+* Mon Apr 12 2010 Karel Zak <kzak at redhat.com> 2.16.2-8
+- fix #581252 - remounting tmpfs fails because of hidden rootcontext=
+
 * Mon Mar  8 2010 Karel Zak <kzak at redhat.com> 2.16.2-7
 - fix #570606 - blkid (and related) should be a bit more robust