mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-28 00:04:05 +02:00
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
This commit is contained in:
parent
c35ce18c29
commit
1ce8862ab4
@ -19,7 +19,6 @@ REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' )
|
|||||||
ifeq ($(REV),)
|
ifeq ($(REV),)
|
||||||
REV:=0
|
REV:=0
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
ifneq ($(DUMP),1)
|
ifneq ($(DUMP),1)
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Copyright (C) 2006 OpenWrt.org
|
# Copyright (C) 2006 OpenWrt.org
|
||||||
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
|
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
|
||||||
mount_root
|
[ -e /etc/preinit.arch ] && . /etc/preinit.arch
|
||||||
|
mount_root ${FAILSAFE:+failsafe}
|
||||||
exec /sbin/init
|
exec /sbin/init
|
||||||
|
@ -5,7 +5,19 @@
|
|||||||
mount none /proc -t proc
|
mount none /proc -t proc
|
||||||
size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)<l)?$2-l:s}' /proc/meminfo)
|
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
|
mount none /tmp -t tmpfs -o size=$size,nosuid,nodev,mode=1777
|
||||||
|
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 && {
|
grep rootfs /proc/mtd >/dev/null 2>/dev/null && {
|
||||||
mtd unlock rootfs
|
mtd unlock rootfs
|
||||||
grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
|
grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && {
|
||||||
@ -15,7 +27,6 @@ grep rootfs /proc/mtd >/dev/null 2>/dev/null && {
|
|||||||
fopivot /jffs /rom
|
fopivot /jffs /rom
|
||||||
}
|
}
|
||||||
} || mount -o remount,rw /dev/root /
|
} || mount -o remount,rw /dev/root /
|
||||||
|
}
|
||||||
|
|
||||||
mkdir -p /dev/pts
|
|
||||||
mount none /dev/pts -t devpts
|
|
||||||
grep sysfs /proc/filesystems >/dev/null && mount -t sysfs none /sys 2>&-
|
grep sysfs /proc/filesystems >/dev/null && mount -t sysfs none /sys 2>&-
|
||||||
|
2
target/linux/x86-2.6/base-files/default/etc/preinit.arch
Normal file
2
target/linux/x86-2.6/base-files/default/etc/preinit.arch
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
mount -t proc none /proc
|
||||||
|
grep 'failsafe=' /proc/cmdline && export FAILSAFE=true
|
@ -9,3 +9,7 @@ root (hd0,0)
|
|||||||
kernel /boot/vmlinuz @CMDLINE@ noinitrd console=ttyS0,@BAUDRATE@n8 reboot=bios
|
kernel /boot/vmlinuz @CMDLINE@ noinitrd console=ttyS0,@BAUDRATE@n8 reboot=bios
|
||||||
boot
|
boot
|
||||||
|
|
||||||
|
title OpenWrt (failsafe)
|
||||||
|
root (hd0,0)
|
||||||
|
kernel /boot/vmlinuz failsafe=true @CMDLINE@ noinitrd console=ttyS0,@BAUDRATE@n8 reboot=bios
|
||||||
|
boot
|
||||||
|
Loading…
Reference in New Issue
Block a user