diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2005-10-17 21:27:07 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2005-10-17 21:27:07 +0000 |
| commit | a9546761311f334f4e2f41b3a4f8fa851cbd7a2c (patch) | |
| tree | 02aab3aa4c350367b9a36d778535171e95a352c8 | |
| parent | 7da16eaa336eec5eb6abd1a112d9a92686ac30a0 (diff) | |
| download | upstream-a9546761311f334f4e2f41b3a4f8fa851cbd7a2c.tar.gz upstream-a9546761311f334f4e2f41b3a4f8fa851cbd7a2c.tar.bz2 upstream-a9546761311f334f4e2f41b3a4f8fa851cbd7a2c.zip | |
some fixes/cleanups for the init scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2152 3c298f89-4303-0410-b956-a3cf2f4a3e73
4 files changed, 5 insertions, 3 deletions
diff --git a/openwrt/package/base-files/default/etc/firewall.user b/openwrt/package/base-files/default/etc/firewall.user index 7a13141623a..5774f0c64ac 100755 --- a/openwrt/package/base-files/default/etc/firewall.user +++ b/openwrt/package/base-files/default/etc/firewall.user @@ -1,5 +1,7 @@ #!/bin/sh . /etc/functions.sh +. /etc/network.overrides +[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network WAN=$(nvram get wan_ifname) LAN=$(nvram get lan_ifname) diff --git a/openwrt/package/base-files/default/etc/init.d/S50httpd b/openwrt/package/base-files/default/etc/init.d/S50httpd index 01772c12ead..a1b883d0a81 100755 --- a/openwrt/package/base-files/default/etc/init.d/S50httpd +++ b/openwrt/package/base-files/default/etc/init.d/S50httpd @@ -1,2 +1,2 @@ #!/bin/sh -[ -d /www ] && httpd -p 80 -h /www -r WRT54G Router +[ -d /www ] && httpd -p 80 -h /www -r OpenWrt diff --git a/openwrt/package/base-files/default/etc/preinit b/openwrt/package/base-files/default/etc/preinit index d64fdaa5130..88c8920c941 100755 --- a/openwrt/package/base-files/default/etc/preinit +++ b/openwrt/package/base-files/default/etc/preinit @@ -7,7 +7,7 @@ insmod diag sleep 1 if [ -f /proc/sys/reset ] && [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then export FAILSAFE=true - [ "$(nvram get boot_wait)" != "on" ] && { + [ -x /usr/sbin/nvram -a "$(nvram get boot_wait)" != "on" ] && { nvram set boot_wait=on nvram commit } diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root index 32a6ee548fe..bc8d69c79ba 100755 --- a/openwrt/package/base-files/default/sbin/mount_root +++ b/openwrt/package/base-files/default/sbin/mount_root @@ -13,7 +13,7 @@ if [ "$1" != "failsafe" ]; then mount -o remount,rw /dev/root / fi 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 mount -t jffs2 /dev/mtdblock/4 /jffs pivot_root /jffs /jffs/rom |