From: Robin H. Johnson Date: Tue, 24 Jul 2012 17:28:57 +0000 (+0000) Subject: Minor thinko in devpts check. X-Git-Tag: v3.4.40~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c79d57926f31184c526989d0076b0649ad862039;p=genkernel.git Minor thinko in devpts check. Signed-off-by: Robin H. Johnson --- diff --git a/ChangeLog b/ChangeLog index de4fac8..10f8cfa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,10 @@ # - 2008-2011 Various authors (see AUTHORS) # Distributed under the GPL v2 # $Id$ - + + 24 Jul 2012; Robin H. Johnson defaults/initrd.scripts: + Minor thinko in devpts check. + 24 Jul 2012; Robin H. Johnson defaults/initrd.scripts: Prior commit to only mount devtmpfs and devpts if they were not already mounted made assumptions about the device names they were mounted as. Check diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index fb64f84..814919b 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -313,7 +313,7 @@ mount_devfs () { fi # http://git.busybox.net/busybox/plain/docs/mdev.txt - if awk 'BEGIN{m=1;} /devtmpfs/{if($3 == "devpts") {m=0;} } END { exit m;}' /proc/mounts; then + if awk 'BEGIN{m=1;} /devpts/{if($3 == "devpts") {m=0;} } END { exit m;}' /proc/mounts; then mkdir -m 0755 /dev/pts mount -t devpts -o gid=5,mode=0620 devpts /dev/pts || bad_msg "Failed to mount /dev/pts" fi