[Pkg-sysvinit-commits] r1299 - in sysvinit/trunk/debian: . initscripts/lib/init

[pere at alioth.debian.org]

Author: pere
Date: 2008-08-12 11:03:44 +0000 (Tue, 12 Aug 2008)
New Revision: 1299

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
Log:
* Make sure to call restorecon after mounting tmpfs file systems, to
  set SELinux permissions (Closes: #493679).  Patch from Russell
  Coker.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2008-08-12 10:53:17 UTC (rev 1298)
+++ sysvinit/trunk/debian/changelog	2008-08-12 11:03:44 UTC (rev 1299)
@@ -7,6 +7,9 @@
   * Modify runlevel detection code in invoke-rc.d to notice the
     difference between runlevels 0 and 6, and the boot runlevel, to
     make it possible to use invoke-rc.d during boot (Closes: 384509).
+  * Make sure to call restorecon after mounting tmpfs file systems, to
+    set SELinux permissions (Closes: #493679).  Patch from Russell
+    Coker.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 12 Aug 2008 12:45:37 +0200
 

Modified: sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh	2008-08-12 10:53:17 UTC (rev 1298)
+++ sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh	2008-08-12 11:03:44 UTC (rev 1299)
@@ -114,6 +114,9 @@
 		is_empty_dir "$MTPT" >/dev/null 2>&1 || log_warning_msg "Files under mount point '$MTPT' will be hidden."
 	fi
 	mount -n -t $FSTYPE $5 $OPTS $DEVNAME $MTPT
+	if [ "$FSTYPE" = "tmpfs" -a -x /sbin/restorecon ]; then
+		/sbin/restorecon $MTPT
+	fi
 }
 
 #