aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-10-17 21:27:07 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-10-17 21:27:07 +0000
commitba3b3022bd5216ef628116d6114633fb5f8e33e4 (patch)
treec033e88074a7c75c6b7405bc9adfacca2b542cc8 /package
parent7fdc096dbd419b7ee94b2ce8e9c6e12e315da4d2 (diff)
downloadupstream-ba3b3022bd5216ef628116d6114633fb5f8e33e4.tar.gz
upstream-ba3b3022bd5216ef628116d6114633fb5f8e33e4.tar.bz2
upstream-ba3b3022bd5216ef628116d6114633fb5f8e33e4.zip
some fixes/cleanups for the init scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2152 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rwxr-xr-xpackage/base-files/default/etc/firewall.user2
-rwxr-xr-xpackage/base-files/default/etc/init.d/S50httpd2
-rwxr-xr-xpackage/base-files/default/etc/preinit2
-rwxr-xr-xpackage/base-files/default/sbin/mount_root2
4 files changed, 5 insertions, 3 deletions
diff --git a/package/base-files/default/etc/firewall.user b/package/base-files/default/etc/firewall.user
index 7a13141623..5774f0c64a 100755
--- a/package/base-files/default/etc/firewall.user
+++ b/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/package/base-files/default/etc/init.d/S50httpd b/package/base-files/default/etc/init.d/S50httpd
index 01772c12ea..a1b883d0a8 100755
--- a/package/base-files/default/etc/init.d/S50httpd
+++ b/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/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index d64fdaa513..88c8920c94 100755
--- a/package/base-files/default/etc/preinit
+++ b/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/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root
index 32a6ee548f..bc8d69c79b 100755
--- a/package/base-files/default/sbin/mount_root
+++ b/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