From e2189311fc8c036327c1c8263807b274d5ff039b Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Tue, 17 Jul 2012 16:13:57 -0400 Subject: [PATCH] Verify in /proc/mounts that devtmpfs is unmounted before mounting it For consistency, we do the same with devpts. WilliamH reported this to me in IRC. --- defaults/initrd.scripts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 258f2bd..a2edeee 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -307,12 +307,16 @@ mount_devfs () { fi # Options copied from /etc/init.d/udev-mount, should probably be kept in sync - mount -t $devfs -o "exec,nosuid,mode=0755,size=10M" udev /dev \ - || bad_msg "Failed to mount /dev as ${devfs}" + if grep -qs grep '^devtmpfs' /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 - mkdir -m 0755 /dev/pts - mount -t devpts -o gid=5,mode=0620 devpts /dev/pts || bad_msg "Failed to mount /dev/pts" + if grep -qs grep '^devpts' /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 } test_success() { -- 2.26.2