rpms/util-linux-ng/devel mount.tmpfs, 1.1, 1.2 util-linux-ng.spec, 1.42, 1.43

[Karel Zak]

Author: kzak

Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25764

Modified Files:
	mount.tmpfs util-linux-ng.spec 
Log Message:
* Fri Mar 20 2009 Karel Zak <kzak at redhat.com>  2.14.2-6
- fix #491175 - mount of tmpfs FSs fail at boot



Index: mount.tmpfs
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/mount.tmpfs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mount.tmpfs	19 Mar 2009 10:11:57 -0000	1.1
+++ mount.tmpfs	20 Mar 2009 08:16:17 -0000	1.2
@@ -2,12 +2,17 @@
 #
 # Copyright (C) 2009 Eric Paris <eparis at redhat.com>
 #                    Daniel Walsh <dwalsh at redhat.com>
+#                    Karel Zak <kzak at redhat.com>
 #
 # http://bugzilla.redhat.com/show_bug.cgi?id=476964
 #
+# Usage:
+# /sbin/mount.tmpfs spec dir [-sfnv] [-o options]
+#
 
 if ! echo "$@" | grep -q -E '(fs|def|root)?context='; then
-  if con=$(ls -Zd "$2" | cut -f 5 -d ' '); then 
+  con=$(ls --scontext -d "$2" | cut -f 1 -d ' ')
+  if [ -n "$con" ] && [ "$con" != "?" ] && [ "$con" != "unlabeled" ]; then 
       /bin/mount "$@" -o rootcontext=\"$con\" -i -t tmpfs
       exit $?
   fi


Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- util-linux-ng.spec	19 Mar 2009 10:11:58 -0000	1.42
+++ util-linux-ng.spec	20 Mar 2009 08:16:20 -0000	1.43
@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Name: util-linux-ng
 Version: 2.14.2
-Release: 5%{?dist}
+Release: 6%{?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
@@ -544,6 +544,9 @@
 /sbin/losetup
 
 %changelog
+* Fri Mar 20 2009 Karel Zak <kzak at redhat.com>  2.14.2-6
+- fix #491175 - mount of tmpfs FSs fail at boot
+
 * Thu Mar 19 2009 Karel Zak <kzak at redhat.com>  2.14.2-5
 - fix #489672 - flock segfaults when file name is not given (upstream)
 - fix #476964 - Mount /var/tmp with tmpfs creates denials