diff --git a/package/base/sysfiles/etc_fstab.txt b/package/base/sysfiles/etc_fstab.txt index 9576cf0ad..00a2b37a1 100644 --- a/package/base/sysfiles/etc_fstab.txt +++ b/package/base/sysfiles/etc_fstab.txt @@ -1,7 +1,6 @@ /dev/root / auto defaults 0 1 -none /proc proc defaults 0 0 -#none /dev devfs defaults 0 0 -none /dev/pts devpts defaults 0 0 -none /dev/shm ramfs defaults 0 0 -none /sys sysfs defaults 0 0 -#none /tmp tmpfs defaults 0 0 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts defaults 0 0 +ramfs /dev/shm ramfs defaults 0 0 +sysfs /sys sysfs defaults 0 0 +#tmpfs /tmp tmpfs defaults 0 0 diff --git a/package/base/sysfiles/etc_initscript.txt b/package/base/sysfiles/etc_initscript.txt index 7c50de91e..9b4b90ccc 100644 --- a/package/base/sysfiles/etc_initscript.txt +++ b/package/base/sysfiles/etc_initscript.txt @@ -38,7 +38,7 @@ fi case "$devtype" in devfs) if ! [ -e /dev/.devfsd ] ; then - mount -v -n -t devfs none /dev + mount -v -n -t devfs devfs /dev exec > /dev/console 2>&1 < /dev/console echo "Mounted /dev (devfs) from /etc/initscript." fi @@ -48,11 +48,11 @@ case "$devtype" in if ! [ -e /dev/.udevdb ] ; then if [ -e /dev/.devfsd ]; then mount --move /dev /etc/udev - mount -t ramfs none /dev + mount -t ramfs ramfs /dev mkdir /dev/devfs mount --move /etc/udev /dev/devfs else - mount -t ramfs none /dev + mount -t ramfs ramfs /dev fi mount -n /sys; mount -n /proc mkdir -p /dev/pts /dev/shm @@ -69,7 +69,7 @@ case "$devtype" in ;; *) if ! [ -e /dev/console ]; then - mount -t ramfs none /dev + mount -t ramfs ramfs /dev mknod -m 600 /dev/console c 5 1 fi exec > /dev/console 2>&1 < /dev/console diff --git a/package/base/sysfiles/hwscan.awk b/package/base/sysfiles/hwscan.awk index 966aee294..05a78c370 100644 --- a/package/base/sysfiles/hwscan.awk +++ b/package/base/sysfiles/hwscan.awk @@ -161,7 +161,7 @@ function get_usb_drivers() { id = "usb-controller (PCI " usb_ctrl_driver ")"; driver_mod[id] = usb_ctrl_driver; driver_dsc[id] = usb_ctrl_desc; - driver_cmd[id] = "\nmount -t usbfs none /proc/bus/usb"; + driver_cmd[id] = "\nmount -t usbfs usbfs /proc/bus/usb"; drivers[id] = id; autocomplete(usb_ctrl_driver, id); } diff --git a/package/base/sysfiles/stone_mod_install.sh b/package/base/sysfiles/stone_mod_install.sh index 3210a69ae..3d115ba83 100644 --- a/package/base/sysfiles/stone_mod_install.sh +++ b/package/base/sysfiles/stone_mod_install.sh @@ -210,9 +210,9 @@ This dialog allows you to modify your discs parition layout and to create filesy $STONE packages cat > /mnt/target/tmp/stone_postinst.sh << EOT #!/bin/sh -mount -v -t ramfs none /dev -mount -v -t proc none /proc -mount -v -t sysfs none /sys +mount -v -t ramfs ramfs /dev +mount -v -t proc proc /proc +mount -v -t sysfs sysfs /sys /sbin/udevstart . /etc/profile stone setup diff --git a/package/base/sysfiles/stone_mod_setup.sh b/package/base/sysfiles/stone_mod_setup.sh index 0dfe0498c..10d10a803 100644 --- a/package/base/sysfiles/stone_mod_setup.sh +++ b/package/base/sysfiles/stone_mod_setup.sh @@ -27,11 +27,11 @@ make_fstab() { cat <<- EOT > $tmp2 /dev/root / auto defaults 0 1 -none /proc proc defaults 0 0 -none /dev/pts devpts defaults 0 0 -none /dev/shm ramfs defaults 0 0 -none /sys sysfs defaults 0 0 -#none /tmp tmpfs defaults 0 0 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts defaults 0 0 +ramfs /dev/shm ramfs defaults 0 0 +sysfs /sys sysfs defaults 0 0 +#tmpfs /tmp tmpfs defaults 0 0 EOT for x in /dev/cdroms/cdrom[0-9] ; do diff --git a/package/blindcoder/rockinitrd/linuxrc b/package/blindcoder/rockinitrd/linuxrc index 8e6cda1b8..5b879a04d 100644 --- a/package/blindcoder/rockinitrd/linuxrc +++ b/package/blindcoder/rockinitrd/linuxrc @@ -33,10 +33,10 @@ PATH="/sbin:/usr/sbin:/bin/:/usr/bin" rootfs="" rootfsmounted=0 -mount -n -t tmpfs none /tmp -mount -n -t proc none /proc -mount -n -t sysfs none /sys -mount -n -t ramfs none /dev +mount -n -t tmpfs tmpfs /tmp +mount -n -t proc proc /proc +mount -n -t sysfs sysfs /sys +mount -n -t ramfs ramfs /dev /sbin/udevstart /sbin/udevd --daemon cd /dev diff --git a/package/fake/pseudonative-daemon/pseudonative_daemon.c b/package/fake/pseudonative-daemon/pseudonative_daemon.c index 61326da6b..a39d66e20 100644 --- a/package/fake/pseudonative-daemon/pseudonative_daemon.c +++ b/package/fake/pseudonative-daemon/pseudonative_daemon.c @@ -135,7 +135,7 @@ void do_chroot(char *d, char *b) system(buf); snprintf(buf, 1024, "mount -t nfs -o noac %s/download %s/ROCK/download", d, e); system(buf); - snprintf(buf, 1024, "mount -t proc none %s/proc", e); + snprintf(buf, 1024, "mount -t proc proc %s/proc", e); system(buf); } diff --git a/package/teha/rescue-stage1-init/init.c b/package/teha/rescue-stage1-init/init.c index ac4c594a5..338ee8793 100644 --- a/package/teha/rescue-stage1-init/init.c +++ b/package/teha/rescue-stage1-init/init.c @@ -255,7 +255,7 @@ int main(int argc, char **argv) { } } - if (mount("none", "/dev", "devfs", 0, NULL)) { + if (mount("devfs", "/dev", "devfs", 0, NULL)) { if (errno != EBUSY) { /* might be mounted automatically at boot */ perror("Can't mount /dev"); die(); @@ -268,7 +268,7 @@ int main(int argc, char **argv) { bootdev, bootfst); shell(); } - if (mount("none", "/mnt_root", "tmpfs", 0, TMPFS_OPTIONS)) { + if (mount("tmpfs", "/mnt_root", "tmpfs", 0, TMPFS_OPTIONS)) { perror("Can't mount root-tmpfs. I need it at /mnt_root - good luck."); shell(); } diff --git a/scripts/Build-Pkg b/scripts/Build-Pkg index aae984504..df6b1e2d5 100755 --- a/scripts/Build-Pkg +++ b/scripts/Build-Pkg @@ -217,7 +217,7 @@ if [ "$chroot" = 1 ] ; then if [ ! -f /proc/sys/fs/binfmt_misc/register ] ; then echo_status "Mounting /proc/sys/fs/binfmt_misc." - mount -t binfmt_misc none /proc/sys/fs/binfmt_misc + mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc fi echo_status "Registering pseudonative_handler." @@ -275,7 +275,7 @@ if [ "$chroot" = 1 ] ; then fi if [ ! -f proc/mounts ]; then - mount -t proc none $PWD/proc + mount -t proc proc $PWD/proc fi for x in Documentation architecture misc package scripts target; do @@ -687,7 +687,7 @@ echo_status "Preparing build in src.$xpkg.$id" mkdir -p $builddir; chmod 700 $builddir if [ $clear_src = 1 ] ; then if [ "$ROCKCFG_SRC_TMPFS" = 1 ]; then - mount -t tmpfs -o $ROCKCFG_SRC_TMPFS_OPT none $builddir + mount -t tmpfs -o $ROCKCFG_SRC_TMPFS_OPT tmpfs $builddir fi fi diff --git a/scripts/Create-UMLRootfs b/scripts/Create-UMLRootfs index 3c24da5b6..d0f96add5 100755 --- a/scripts/Create-UMLRootfs +++ b/scripts/Create-UMLRootfs @@ -151,12 +151,12 @@ chroot $mountpoint bash /etc/cron.d/00-updates sed -i -e 's,vc/1,vc/0,' -e 's,^\([2-6]:\),#\1,' $mountpoint/etc/inittab cat >$mountpoint/etc/fstab < etc/boot.d/05-system -[ -f /proc/mounts ] || mount -t proc none /proc +[ -f /proc/mounts ] || mount -t proc proc /proc [ -d /mnt/boot ] || mkdir -p /mnt/boot [ -d /dev/pts ] && mount /dev/pts rm -f /dev/fd ; ln -s /proc/self/fd /dev/fd diff --git a/target/rescue/contrib/init-boot-cycle b/target/rescue/contrib/init-boot-cycle index 8b1c262ea..6ce370f70 100644 --- a/target/rescue/contrib/init-boot-cycle +++ b/target/rescue/contrib/init-boot-cycle @@ -55,7 +55,7 @@ fail_shell() { # some init export PATH=/sbin:/bin:/usr/sbin:/usr/bin -mount -t proc none /proc +mount -t proc proc /proc mkdir /mnt/boot /mnt/root mount --move /old_root/mnt_boot /mnt/boot umount -n /old_root diff --git a/target/router/init.sh b/target/router/init.sh index a4f35e739..924104875 100644 --- a/target/router/init.sh +++ b/target/router/init.sh @@ -1,8 +1,8 @@ #!/bin/bash -mount -n -t proc none /proc -mount -n -t tmpfs none /tmp -mount -n -t devpts none /dev/pts +mount -n -t proc proc /proc +mount -n -t tmpfs tmpfs /tmp +mount -n -t devpts devpts /dev/pts cat /proc/mounts > /etc/fstab cat /proc/mounts > /etc/mtab