aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/sbin
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-03-03 22:32:13 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-03-03 22:32:13 +0000
commitc96e173c287dcbce1813420940e79900f030c467 (patch)
tree0ec42c4bfa21f6367f247aa3200ff9af1c3d056b /package/base-files/files/sbin
parentdf228a5d999ae01431f2d2bac37e312468d8edc9 (diff)
downloadupstream-c96e173c287dcbce1813420940e79900f030c467.tar.gz
upstream-c96e173c287dcbce1813420940e79900f030c467.tar.bz2
upstream-c96e173c287dcbce1813420940e79900f030c467.zip
add failsafe support for x86-2.6 and fix mdev support for platforms using /etc/preinit
SVN-Revision: 6481
Diffstat (limited to 'package/base-files/files/sbin')
-rwxr-xr-xpackage/base-files/files/sbin/mount_root33
1 files changed, 22 insertions, 11 deletions
diff --git a/package/base-files/files/sbin/mount_root b/package/base-files/files/sbin/mount_root
index 607877c643..4fa048f43a 100755
--- a/package/base-files/files/sbin/mount_root
+++ b/package/base-files/files/sbin/mount_root
@@ -5,17 +5,28 @@
mount none /proc -t proc
size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)<l)?$2-l:s}' /proc/meminfo)
mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
-
-grep rootfs /proc/mtd >/dev/null 2>/dev/null && {
- mtd unlock rootfs
- grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
- . /bin/firstboot
- echo "switching to jffs2"
- mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2
- fopivot /jffs /rom
- }
-} || mount -o remount,rw /dev/root /
-
+if grep devfs /proc/filesystems > /dev/null; then
+ mount none /dev -t devfs
+else
+ mount -t sysfs none /sys
+ mount -t tmpfs tmpfs /dev -o size=512K
+ mknod /dev/console c 5 1
+ mkdir /dev/shm
+ /sbin/mdev -s
+fi
mkdir -p /dev/pts
mount none /dev/pts -t devpts
+
+[ failsafe != "$1" ] && {
+ grep rootfs /proc/mtd >/dev/null 2>/dev/null && {
+ mtd unlock rootfs
+ grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
+ . /bin/firstboot
+ echo "switching to jffs2"
+ mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2
+ fopivot /jffs /rom
+ }
+ } || mount -o remount,rw /dev/root /
+}
+
grep sysfs /proc/filesystems >/dev/null && mount -t sysfs none /sys 2>&-