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

[Kel Modderman]

Author: kelmo-guest
Date: 2009-06-23 10:41:34 +0000 (Tue, 23 Jun 2009)
New Revision: 1333

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh
Log:
Revert r1322, reinstate previous /dev/pts handling.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-06-23 10:36:19 UTC (rev 1332)
+++ sysvinit/trunk/debian/changelog	2009-06-23 10:41:34 UTC (rev 1333)
@@ -39,9 +39,6 @@
     earlier. Thanks to Patrick <pet at painfullscratch.nl>.  (Closes: #512003)
   * Use -delete option of find(1) instead of piping through xargs in
     debian/initscripts/lib/init/bootclean.sh. (Closes: #316468, #461103)
-  * Always mount /dev/pts when running Linux kernel, and do not make
-    /dev/ptmx manually because udev does this. Merged from 2.86.ds1-
-    61ubuntu1.
   * Standardise indentation level used in debian/sysv-rc/etc/init.d/rc. Use
     tabs only, and not a mixture of tabs, 2 and 4 spaces.
   * Debian policy version 3.8.1 no longer mandates that scripts with .sh
@@ -67,7 +64,7 @@
     - "Don't use bash" section removed since umountfs seems to have been
       converted to policy compliant sh code already
 
- -- Kel Modderman <kel at otaku42.de>  Tue, 23 Jun 2009 20:32:05 +1000
+ -- Kel Modderman <kel at otaku42.de>  Tue, 23 Jun 2009 20:40:49 +1000
 
 sysvinit (2.86.ds1-61) unstable; urgency=low
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh	2009-06-23 10:36:19 UTC (rev 1332)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh	2009-06-23 10:41:34 UTC (rev 1333)
@@ -36,11 +36,42 @@
 	domount tmpfs shmfs /dev/shm tmpfs -onosuid,nodev$SHM_OPT
 
 	#
-	# Mount /dev/pts. Master ptmx node is already created by udev.
+	# Mount /dev/pts. Create master ptmx node if needed.
 	#
+	# As of 2.5.68, devpts is not automounted when using devfs. So we
+	# mount devpts if it is compiled in (older devfs didn't require it
+	# to be compiled in at all).
+	#
 	if [ "$KERNEL" = Linux ]
 	then
-		domount devpts "" /dev/pts devpts -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE
+		#
+		# Since kernel 2.5.something, devfs doesn't include
+		# a standard /dev/pts directory anymore. So if devfs
+		# is mounted on /dev we need to create that directory
+		# manually.
+		#
+		if [ ! -d /dev/pts ]
+		then
+			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 ]
+		then
+			if [ ! -c /dev/ptmx ]
+			then
+				mknod --mode=666 /dev/ptmx c 5 2
+				ES=$?
+				if [ "$ES" != 0 ]
+				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
 	fi
 }