summaryrefslogtreecommitdiff
path: root/openwrt/package/base-files
diff options
context:
space:
mode:
authorwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-10 18:28:33 +0000
committerwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-10 18:28:33 +0000
commit6f8004f613c150756c62b31518740054d518a651 (patch)
tree6ae11ee54717b18a79bef4002784907ffefd6a82 /openwrt/package/base-files
parent1ddbca81497a8265a7cd94986cc60f973a2e3010 (diff)
add nvram.sh to all startup scripts, no errors on wgt634u
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1892 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/base-files')
-rwxr-xr-xopenwrt/package/base-files/default/etc/functions.sh16
-rwxr-xr-xopenwrt/package/base-files/default/etc/init.d/S10boot5
-rwxr-xr-xopenwrt/package/base-files/default/etc/init.d/rcS1
-rw-r--r--openwrt/package/base-files/default/etc/nvram.sh17
-rwxr-xr-xopenwrt/package/base-files/default/etc/preinit1
-rwxr-xr-xopenwrt/package/base-files/default/sbin/mount_root1
6 files changed, 25 insertions, 16 deletions
diff --git a/openwrt/package/base-files/default/etc/functions.sh b/openwrt/package/base-files/default/etc/functions.sh
index 14f5011db7..c813e39a61 100755
--- a/openwrt/package/base-files/default/etc/functions.sh
+++ b/openwrt/package/base-files/default/etc/functions.sh
@@ -1,22 +1,8 @@
#!/bin/ash
+. /etc/nvram.sh
alias debug=${DEBUG:-:}
-# allow env to override nvram
-nvram () {
- if [ -x /usr/sbin/nvram ]; then
- case $1 in
- get) eval "echo \${$2:-\$(command nvram get $2)}";;
- *) command nvram $*;;
- esac
- else
- case $1 in
- get) eval "echo \${$2:-\${DEFAULT_$2}}";;
- *);;
- esac
- fi
-}
-
# valid interface?
if_valid () (
ifconfig "$1" >&- 2>&- ||
diff --git a/openwrt/package/base-files/default/etc/init.d/S10boot b/openwrt/package/base-files/default/etc/init.d/S10boot
index 37eb7b3cc7..3ec41b1190 100755
--- a/openwrt/package/base-files/default/etc/init.d/S10boot
+++ b/openwrt/package/base-files/default/etc/init.d/S10boot
@@ -1,5 +1,8 @@
#!/bin/sh
-echo "S" > /proc/jffs2_bbc
+. /etc/nvram.sh
+if [ "$(uname -r|grep 2.4)" = "0" ];do
+ echo "S" > /proc/jffs2_bbc
+done
mkdir -p /var/run
mkdir -p /var/log
diff --git a/openwrt/package/base-files/default/etc/init.d/rcS b/openwrt/package/base-files/default/etc/init.d/rcS
index 706585801c..10079c5932 100755
--- a/openwrt/package/base-files/default/etc/init.d/rcS
+++ b/openwrt/package/base-files/default/etc/init.d/rcS
@@ -1,4 +1,5 @@
#!/bin/sh
+. /etc/nvram.sh
syslog_ip=$(nvram get log_ipaddr)
ipcalc -s "$syslog_ip" || syslog_ip=""
syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip}
diff --git a/openwrt/package/base-files/default/etc/nvram.sh b/openwrt/package/base-files/default/etc/nvram.sh
new file mode 100644
index 0000000000..f1170ac470
--- /dev/null
+++ b/openwrt/package/base-files/default/etc/nvram.sh
@@ -0,0 +1,17 @@
+#!/bin/ash
+
+# allow env to override nvram
+nvram () {
+ if [ -x /usr/sbin/nvram ]; then
+ case $1 in
+ get) eval "echo \${$2:-\$(command nvram get $2)}";;
+ *) command nvram $*;;
+ esac
+ else
+ case $1 in
+ get) eval "echo \${$2:-\${DEFAULT_$2}}";;
+ *);;
+ esac
+ fi
+}
+
diff --git a/openwrt/package/base-files/default/etc/preinit b/openwrt/package/base-files/default/etc/preinit
index b23f8833ef..34de88c602 100755
--- a/openwrt/package/base-files/default/etc/preinit
+++ b/openwrt/package/base-files/default/etc/preinit
@@ -1,4 +1,5 @@
#!/bin/sh
+. /etc/nvram.sh
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
mount none /proc -t proc
insmod diag
diff --git a/openwrt/package/base-files/default/sbin/mount_root b/openwrt/package/base-files/default/sbin/mount_root
index 29c5126ba1..ae78ee4881 100755
--- a/openwrt/package/base-files/default/sbin/mount_root
+++ b/openwrt/package/base-files/default/sbin/mount_root
@@ -1,4 +1,5 @@
#!/bin/sh
+. /etc/nvram.sh
if [ "$1" != "failsafe" ]; then
mount | grep jffs2 >&-
if [ $? = 0 ] ; then