KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add base-files change from whiterussian

Browse source 
SVN-Revision: 2257
This commit is contained in:
Felix Fietkau 2005-10-22 19:54:33 +00:00
parent fb8995c621
commit 5b6b1930b0
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openwrt/package/base-files/Makefile
View file

@ -3,7 +3,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=2 PKG_RELEASE:=4
PKG_BUILD_DIR:=$(BUILD_DIR)/base-files PKG_BUILD_DIR:=$(BUILD_DIR)/base-files
REV:=${shell svn info | grep Revision | cut -d ' ' -f 2} REV:=${shell svn info | grep Revision | cut -d ' ' -f 2}

13
openwrt/package/base-files/default/sbin/mount_root
View file

@ -1,10 +1,15 @@
#!/bin/sh #!/bin/sh
. /etc/nvram.sh . /etc/nvram.sh
is_clean() {
OFFSET="$((0x$(dd if=/dev/mtdblock/1 bs=1 skip=$((0x14)) count=2 2>&- | hexdump | grep 0000000 | cut -d ' ' -f 2) - 1))"
dd if=/dev/mtdblock/1 bs=1 skip=$OFFSET count=1 2>&- | hexdump -v | grep ' 0000' > /dev/null && return 255 || return 0
}
if [ "$1" != "failsafe" ]; then if [ "$1" != "failsafe" ]; then
mount | grep jffs2 >&- mount | grep jffs2 >&-
if [ $? = 0 ] ; then if [ $? = 0 ] ; then
if [ $(cat /proc/mtd | wc -l) = 6 ]; then if [ $(cat /proc/mtd | wc -l) = 6 ]; then
[ -f /proc/sys/diag ] && echo 5 > /proc/sys/diag echo 5 > /proc/sys/diag
mtd unlock linux mtd unlock linux
mtd erase OpenWrt mtd erase OpenWrt
jffs2root --move jffs2root --move
@ -13,7 +18,11 @@ if [ "$1" != "failsafe" ]; then
mount -o remount,rw /dev/root / mount -o remount,rw /dev/root /
fi fi
else else
if [ \! -x /usr/sbin/nvram -o -z "$(nvram get no_root_swap)" ]; then if [ -z "$(nvram get no_root_swap)" ]; then
is_clean || {
mtd erase OpenWrt
jffs2root --clean
}
mtd unlock OpenWrt mtd unlock OpenWrt
mount -t jffs2 /dev/mtdblock/4 /jffs mount -t jffs2 /dev/mtdblock/4 /jffs
pivot_root /jffs /jffs/rom pivot_root /jffs /jffs/rom