From 9578d572bfab894dbdfd3db3469dbdc563a47197 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 10 Jun 2014 15:09:38 +0200 Subject: [stage31] mount /dev through devtmpfs --- remote/rootfs/rootfs-stage31/data/init | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index e3c3f27e..016ad73b 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -23,6 +23,8 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin [ ! -f /proc/cpuinfo ] && busybox mount -n -t proc proc /proc bench_event "KERNEL" "Kernel initialized" [ ! -d /sys/class ] && busybox mount -n -t sysfs sysfs /sys +# NOTE: busybox mount is only available through the busybox binary, +# the link had to be dropped, to prevent bugs in the stage32. busybox mount -n -t tmpfs -o 'mode=755' run "/run" # preparations for mounting stage3.2 @@ -32,9 +34,7 @@ busybox mount -n -t tmpfs -o 'mode=755' none "$FUTURE_ROOT" mkdir -p "$FUTURE_ROOT/opt/openslx" # let kernel know that mdev is to be used for hotplug -# FIXME: check, if could be entirely replaced by: -# mount -n -t devtmpfs -o 'rw,nosuid,noexec,mode=0755' initramfsdevs /dev -echo "/sbin/mdev" > /proc/sys/kernel/hotplug +busybox mount -n -t devtmpfs -o 'rw,relatime,nosuid,noexec,mode=0755' initramfsdevs /dev # read kernel command line DEBUG=0 @@ -63,6 +63,7 @@ for opts in ${KCL}; do esac done +# NOTE: this is only relevant when using the distro's kernel # load kernel modules as given in /etc/modules modprobe -a -b $(cat /etc/modules) 2>/dev/null @@ -80,12 +81,6 @@ else setup_gfx fi - -# discover devices -mdev -s -bench_event "MDEV" "mdev done" -echo "" > /proc/sys/kernel/hotplug - # suppress kernel output if neither DEBUG nor SPLASH is set if [ $SPLASH -eq 0 ]; then [ $DEBUG -ge 1 ] && echo "4 4 1 7" > /proc/sys/kernel/printk || echo "1 1 0 1" >/proc/sys/kernel/printk -- cgit v1.2.3-55-g7522