From: Harald Hoyer Date: Fri, 17 Jun 2011 11:14:18 +0000 (+0200) Subject: base/init: mount virtual filesystems with the filesystem type as source X-Git-Tag: 011~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2c6909468b2a5a966bf9af7dab9407d66f10198;p=thirdparty%2Fdracut.git base/init: mount virtual filesystems with the filesystem type as source --- diff --git a/modules.d/99base/init b/modules.d/99base/init index ce5e2e985..d7eb9c55c 100755 --- a/modules.d/99base/init +++ b/modules.d/99base/init @@ -79,10 +79,10 @@ RD_DEBUG="" # mount some important things [ ! -d /proc/self ] && \ - mount -t proc -o nosuid,noexec,nodev /proc /proc >/dev/null 2>&1 + mount -t proc -o nosuid,noexec,nodev proc /proc >/dev/null 2>&1 [ ! -d /sys/kernel ] && \ - mount -t sysfs -o nosuid,noexec,nodev /sys /sys >/dev/null 2>&1 + mount -t sysfs -o nosuid,noexec,nodev sysfs /sys >/dev/null 2>&1 if [ -x /lib/systemd/systemd-timestamp ]; then RD_TIMESTAMP=$(/lib/systemd/systemd-timestamp) @@ -101,9 +101,9 @@ fi if ! ismounted /dev; then # try to mount devtmpfs - if ! mount -t devtmpfs -o mode=0755,nosuid,noexec udev /dev >/dev/null 2>&1; then + if ! mount -t devtmpfs -o mode=0755,nosuid,noexec devtmpfs /dev >/dev/null 2>&1; then # if it failed fall back to normal tmpfs - mount -t tmpfs -o mode=0755,nosuid udev /dev >/dev/null 2>&1 + mount -t tmpfs -o mode=0755,nosuid tmpfs /dev >/dev/null 2>&1 # Make some basic devices first, let udev handle the rest mknod -m 0666 /dev/null c 1 3 mknod -m 0666 /dev/ptmx c 5 2 @@ -125,7 +125,7 @@ fi if ! ismounted /dev/shm; then mkdir -m 0755 /dev/shm - mount -t tmpfs -o mode=1777,nosuid,nodev tmpfs /dev/shm >/dev/null 2>&1 + mount -t tmpfs -o mode=1777,nosuid,nodev tmpfs /dev/shm >/dev/null 2>&1 fi if ! ismounted /run; then