From a1f29a448983ea1757c10fdf5fb8887fcb6eee31 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 15 Nov 2005 21:25:26 +0000 Subject: 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@2506 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'openwrt/target') diff --git a/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram b/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram index ea40cd704e..728b2847b1 100755 --- a/openwrt/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram +++ b/openwrt/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 -- cgit v1.2.3