From: Robin H. Johnson Date: Tue, 24 Jul 2012 08:26:43 +0000 (+0000) Subject: Prior commit to only mount devtmpfs and devpts if they were not already mounted made... X-Git-Tag: v3.4.40~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c924bde4b7accbe1cf3bdba666b615d412c869bf;p=genkernel.git 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 the filesystem column of /proc/mounts instead. Signed-off-by: Robin H. Johnson --- diff --git a/ChangeLog b/ChangeLog index bc9ab5b..de4fac8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,11 @@ # - 2008-2011 Various authors (see AUTHORS) # Distributed under the GPL v2 # $Id$ + + 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 + the filesystem column of /proc/mounts instead. 21 Jul 2012; Sebastian Pipping genkernel: Bump version to 3.4.39 diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 4f0ce1b..fb64f84 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -307,13 +307,13 @@ mount_devfs () { fi # Options copied from /etc/init.d/udev-mount, should probably be kept in sync - if grep -qs '^devtmpfs' /proc/mounts; then + if awk 'BEGIN{m=1;} /devtmpfs/{if($3 == "devtmpfs") {m=0;} } END { exit m;}' /proc/mounts; then mount -t $devfs -o "exec,nosuid,mode=0755,size=10M" udev /dev \ || bad_msg "Failed to mount /dev as ${devfs}" fi # http://git.busybox.net/busybox/plain/docs/mdev.txt - if grep -qs '^devpts' /proc/mounts; then + if awk 'BEGIN{m=1;} /devtmpfs/{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