summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-15 21:25:26 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-11-15 21:25:26 +0000
commit031b526d9e3b438c810269bca4989d34b9a42a2a (patch)
tree3443fe93aad72a67d282399358662bd89216f72c
parentbb542f1000288f73e21e8813e53c237caf5a7589 (diff)
add extra safety for linksys nvram fixup (should fix #56, though i haven't been able to reproduce it)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2506 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xtarget/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram b/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram
index ea40cd704e..728b2847b1 100755
--- a/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram
+++ b/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram
@@ -21,9 +21,9 @@ nvram_default() {
}
nvram_set() { # for the linksys fixup part
- [ "$(nvram get "$1")" = "$2" ] || {
+ [ "$(nvram get "$1")" = "$2" -a "$2" != "" ] || {
COMMIT=1
- nvram set "$1=$2"
+ /usr/sbin/nvram set "$1=$2"
}
}
@@ -35,7 +35,7 @@ adm_switch="$(( ($boardflags & 0x80) >> 7 ))"
case "$(( $boardtype ))" in
"$((0x708))")
if [ "$adm_switch" = 0 ]; then
- nvram_set sdram_init "$(printf 0x%04x $(( $(nvram get sdram_init) | 0x0100 )))"
+ nvram_set sdram_init "$(printf 0x%04x $(( $(/usr/sbin/nvram get sdram_init) | 0x0100 )))"
[ "$COMMIT" = 1 ] && {
nvram_set sdram_config 0x0062
nvram_set clkfreq 216
@@ -49,7 +49,7 @@ case "$(( $boardtype ))" in
fi
;;
"$((0x467))")
- nvram_set sdram_init "$(printf 0x%04x $(( $(nvram get sdram_init) | 0x0100 )))"
+ nvram_set sdram_init "$(printf 0x%04x $(( $(/usr/sbin/nvram get sdram_init) | 0x0100 )))"
[ "$COMMIT" = 1 ] && {
nvram_set sdram_config 0x0062
nvram_set sdram_ncdl 0x0