From 2eb6597bd328affe7dc1dfc8024cb6b7e136b74e Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Sun, 10 Aug 2008 12:23:28 +0000 Subject: [PATCH] remove maybe existing /etc/mtab symlink and only mount usb if kernel supports it svn path=/nixos/trunk/; revision=12570 --- boot/boot-stage-2-init.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/boot-stage-2-init.sh b/boot/boot-stage-2-init.sh index 59f56a06e96..e79f9992734 100644 --- a/boot/boot-stage-2-init.sh +++ b/boot/boot-stage-2-init.sh @@ -29,6 +29,7 @@ mkdir -m 0755 -p /etc test -e /etc/fstab || touch /etc/fstab # to shut up mount mkdir -m 0755 -p /proc mount -n -t proc none /proc +[ -s /etc/mtab ] && rm /etc/mtab # while installing a symlink is created (see man mount), if it's still there for whateever reason remove it cat /proc/mounts > /etc/mtab mkdir -m 0755 -p /etc/nixos @@ -70,7 +71,7 @@ mkdir -m 0755 -p /dev mount -t tmpfs -o "mode=0755" none /dev mkdir -m 0755 -p /dev/pts mount -t devpts none /dev/pts -mount -t usbfs none /proc/bus/usb +[ -e /proc/bus/usb ] && mount -t usbfs none /proc/bus/usb # uml doesn't have usb by default mkdir -m 01777 -p /tmp mkdir -m 0755 -p /var mkdir -m 0755 -p /nix/var