summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-03 22:32:13 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-03-03 22:32:13 +0000
commit1ce8862ab409526a36936eb93db4e23ad92e3b79 (patch)
tree5ce3e989986e46d9b2cf1a0bcbd1adb6696ba92f /target/linux
parentc35ce18c298ee75f599d413fb6872a0f317caeb2 (diff)
add failsafe support for x86-2.6 and fix mdev support for platforms using /etc/preinit
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6481 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-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
2 files changed, 6 insertions, 0 deletions
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 000000000..f29f0d448
--- /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 590a7d5e3..f9d28438f 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