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

[Petter Reinholdtsen]

Author: pere
Date: 2006-10-03 18:26:03 +0000 (Tue, 03 Oct 2006)
New Revision: 1008

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh
Log:
  * Set SE context on /dev/pts and /dev/ptm if they are created by
    mountdevsubfs.sh to work better with SELinux.  Patch from Erich
    Schubert. (Closes: 390897)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-10-02 17:56:41 UTC (rev 1007)
+++ sysvinit/trunk/debian/changelog	2006-10-03 18:26:03 UTC (rev 1008)
@@ -1,3 +1,11 @@
+sysvinit (2.86.ds1-32~1) unstable; urgency=low
+
+  * Set SE context on /dev/pts and /dev/ptm if they are created by
+    mountdevsubfs.sh to work better with SELinux.  Patch from Erich
+    Schubert. (Closes: 390897)
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue,  3 Oct 2006 20:24:12 +0200
+
 sysvinit (2.86.ds1-31) unstable; urgency=low
 
   * Fix calls to fuser in umountnfs.sh.  Thanks to Frank Mehnert for the tip.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh	2006-10-02 17:56:41 UTC (rev 1007)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh	2006-10-03 18:26:03 UTC (rev 1008)
@@ -55,6 +55,7 @@
 			if grep -qs '/dev devfs' /proc/mounts
 			then
 				mkdir --mode=755 /dev/pts
+				[ -x /sbin/restorecon ] && /sbin/restorecon /dev/pts
 			fi
 		fi
 		if [ -d /dev/pts ]
@@ -67,6 +68,7 @@
 				then
 					log_warning_msg "Failed making node /dev/ptmx with error code ${ES}."
 				fi
+				[ -x /sbin/restorecon ] && /sbin/restorecon /dev/ptmx
 			fi
 			domount devpts "" /dev/pts devpts -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE
 		fi