From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 17 Oct 2005 21:27:07 +0000 (+0000)
Subject: some fixes/cleanups for the init scripts
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=995d0343f996a3681110084856fd143b875dfb1b;p=openwrt%2Fstaging%2Fmans0n.git

some fixes/cleanups for the init scripts

SVN-Revision: 2152
---

diff --git a/openwrt/package/base-files/default/etc/firewall.user b/openwrt/package/base-files/default/etc/firewall.user
index 7a13141623..5774f0c64a 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 01772c12ea..a1b883d0a8 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 d64fdaa513..88c8920c94 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 32a6ee548f..bc8d69c79b 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