qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 03:58:35 +02:00
Code

add failsafe support for x86-2.6 and fix mdev support for platforms using /etc/preinit

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6481 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-03-03 22:32:13 +00:00
parent c35ce18c29
commit 1ce8862ab4
5 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/base-files/Makefile
View File

@ -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)

3
package/base-files/files/etc/preinit
View File

@ -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

33
package/base-files/files/sbin/mount_root
View File

@ -5,17 +5,28 @@
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
grep rootfs /proc/mtd >/dev/null 2>/dev/null && { mount none /dev -t devfs
mtd unlock rootfs else
grep rootfs_data /proc/mtd >/dev/null 2>/dev/null && { mount -t sysfs none /sys
. /bin/firstboot mount -t tmpfs tmpfs /dev -o size=512K
echo "switching to jffs2" mknod /dev/console c 5 1
mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2 mkdir /dev/shm
fopivot /jffs /rom /sbin/mdev -s
} fi
} || mount -o remount,rw /dev/root /
mkdir -p /dev/pts mkdir -p /dev/pts
mount none /dev/pts -t devpts 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>&- 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
View File

@ -0,0 +1,2 @@
mount -t proc none /proc
grep 'failsafe=' /proc/cmdline && export FAILSAFE=true

4
target/linux/x86-2.6/image/grub/menu.lst
View File

@ -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