summaryrefslogtreecommitdiff
path: root/openwrt/package/base-files
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-17 21:27:07 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-10-17 21:27:07 +0000
commitae946ea18aac6176889a31b0e388fdebf2c671da (patch)
tree02aab3aa4c350367b9a36d778535171e95a352c8 /openwrt/package/base-files
parente660d02df2e7f9066f79481b3a11915823b48cc3 (diff)
some fixes/cleanups for the init scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2152 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/base-files')
-rwxr-xr-xopenwrt/package/base-files/default/etc/firewall.user2
-rwxr-xr-xopenwrt/package/base-files/default/etc/init.d/S50httpd2
-rwxr-xr-xopenwrt/package/base-files/default/etc/preinit2
-rwxr-xr-xopenwrt/package/base-files/default/sbin/mount_root2
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 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