[Pkg-sysvinit-commits] r157 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2005-11-19 11:44:51 +0000 (Sat, 19 Nov 2005)
New Revision: 157

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
Log:
Only use /sbin/restorecon if /usr/sbin/selinuxenabled return true,
to limit it to systems with SELinux enabled.


Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2005-11-19 11:40:50 UTC (rev 156)
+++ sysvinit/trunk/debian/changelog	2005-11-19 11:44:51 UTC (rev 157)
@@ -21,6 +21,8 @@
   * Add link to alioth project page in the Debian README.
   * Created new file /lib/init/functions.sh for functions common to
     scripts in initscripts.  Moved dir_writable() into it.
+  * Only use /sbin/restorecon if /usr/sbin/selinuxenabled return true,
+    to limit it to systems with SELinux enabled.
 
   [ Thomas Hood ]
   * Improve update-rc.d man page text.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-19 11:40:50 UTC (rev 156)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-19 11:44:51 UTC (rev 157)
@@ -149,8 +149,12 @@
 	if [ -n "$DO_MTAB" ] && [ ! -f /etc/mtab ]
 	then
 		:> /etc/mtab
-		if [ -x /sbin/restorecon /etc/mtab ]; then /sbin/restorecon /etc/mtab; fi;
 	fi
+	
+	if /usr/sbin/selinuxenabled &&
+	    [ -x /sbin/restorecon ] && [ -r /etc/mtab ]; then
+		/sbin/restorecon /etc/mtab
+	fi
 
 	# Mount standard /proc and /sys.
 	domount proc "" /proc