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

[kelmo-guest at alioth.debian.org]

Author: kelmo-guest
Date: 2009-02-02 14:48:59 +0000 (Mon, 02 Feb 2009)
New Revision: 1322

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh
Log:
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.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-02-02 14:34:53 UTC (rev 1321)
+++ sysvinit/trunk/debian/changelog	2009-02-02 14:48:59 UTC (rev 1322)
@@ -38,8 +38,11 @@
     LP: #312764
   * 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.
 
- -- Kel Modderman <kel at otaku42.de>  Tue, 03 Feb 2009 00:30:35 +1000
+ -- Kel Modderman <kel at otaku42.de>  Tue, 03 Feb 2009 00:46:24 +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-02-02 14:34:53 UTC (rev 1321)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh	2009-02-02 14:48:59 UTC (rev 1322)
@@ -36,42 +36,11 @@
 	domount tmpfs shmfs /dev/shm tmpfs -onosuid,nodev$SHM_OPT
 
 	#
-	# Mount /dev/pts. Create master ptmx node if needed.
+	# Mount /dev/pts. Master ptmx node is already created by udev.
 	#
-	# 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
-		#
-		# 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
+		domount devpts "" /dev/pts devpts -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE
 	fi
 }