some fixes/cleanups for the init scripts

SVN-Revision: 2152
This commit is contained in:
Felix Fietkau 2005-10-17 21:27:07 +00:00
parent 810bcd0460
commit 995d0343f9
4 changed files with 5 additions and 3 deletions

View File

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
. /etc/functions.sh . /etc/functions.sh
. /etc/network.overrides
[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
WAN=$(nvram get wan_ifname) WAN=$(nvram get wan_ifname)
LAN=$(nvram get lan_ifname) LAN=$(nvram get lan_ifname)

View File

@ -1,2 +1,2 @@
#!/bin/sh #!/bin/sh
[ -d /www ] && httpd -p 80 -h /www -r WRT54G Router [ -d /www ] && httpd -p 80 -h /www -r OpenWrt

View File

@ -7,7 +7,7 @@ insmod diag
sleep 1 sleep 1
if [ -f /proc/sys/reset ] && [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then if [ -f /proc/sys/reset ] && [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
export FAILSAFE=true export FAILSAFE=true
[ "$(nvram get boot_wait)" != "on" ] && { [ -x /usr/sbin/nvram -a "$(nvram get boot_wait)" != "on" ] && {
nvram set boot_wait=on nvram set boot_wait=on
nvram commit nvram commit
} }

View File

@ -13,7 +13,7 @@ if [ "$1" != "failsafe" ]; then
mount -o remount,rw /dev/root / mount -o remount,rw /dev/root /
fi fi
else else
if [ -z "$(nvram get no_root_swap)" ]; then if [ \! -x /usr/sbin/nvram -o -z "$(nvram get no_root_swap)" ]; then
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