aboutsummaryrefslogtreecommitdiffstats
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
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
-rw-r--r--package/base-files/Makefile1
-rwxr-xr-xpackage/base-files/files/etc/preinit3
-rwxr-xr-xpackage/base-files/files/sbin/mount_root33
-rw-r--r--target/linux/x86-2.6/base-files/default/etc/preinit.arch2
-rw-r--r--target/linux/x86-2.6/image/grub/menu.lst4
5 files changed, 30 insertions, 13 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f02f1c9aa3..30e90453ee 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -19,7 +19,6 @@ REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
ifeq ($(REV),)
REV:=0
endif
-
include $(INCLUDE_DIR)/package.mk
ifneq ($(DUMP),1)
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 74d4e88892..c60a0f850f 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -1,5 +1,6 @@
#!/bin/sh
# Copyright (C) 2006 OpenWrt.org
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-mount_root
+[ -e /etc/preinit.arch ] && . /etc/preinit.arch
+mount_root ${FAILSAFE:+failsafe}
exec /sbin/init
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>&-
diff --git a/target/linux/x86-2.6/base-files/default/etc/preinit.arch b/target/linux/x86-2.6/base-files/default/etc/preinit.arch
new file mode 100644
index 0000000000..f29f0d448b
--- /dev/null
+++ b/target/linux/x86-2.6/base-files/default/etc/preinit.arch
@@ -0,0 +1,2 @@
+mount -t proc none /proc
+grep 'failsafe=' /proc/cmdline && export FAILSAFE=true
diff --git a/target/linux/x86-2.6/image/grub/menu.lst b/target/linux/x86-2.6/image/grub/menu.lst
index 590a7d5e3a..f9d28438f8 100644
--- a/target/linux/x86-2.6/image/grub/menu.lst
+++ b/target/linux/x86-2.6/image/grub/menu.lst
@@ -9,3 +9,7 @@ root (hd0,0)
kernel /boot/vmlinuz @CMDLINE@ noinitrd console=ttyS0,@BAUDRATE@n8 reboot=bios
boot
+title OpenWrt (failsafe)
+root (hd0,0)
+kernel /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd console=ttyS0,@BAUDRATE@n8 reboot=bios
+boot