From ae14513ae7b4816c97d15c592e903403043229c0 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 5 Apr 2006 03:45:06 +0000
Subject: [PATCH] remove more nvram references
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3589 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
.../base-files/files/brcm-2.4/etc/hotplug.d/net/09-net | 8 +++-----
.../base-files/files/brcm-2.6/etc/hotplug.d/net/09-net | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/target/linux/package/base-files/files/brcm-2.4/etc/hotplug.d/net/09-net b/target/linux/package/base-files/files/brcm-2.4/etc/hotplug.d/net/09-net
index 6821bf728..856d26b65 100644
--- a/target/linux/package/base-files/files/brcm-2.4/etc/hotplug.d/net/09-net
+++ b/target/linux/package/base-files/files/brcm-2.4/etc/hotplug.d/net/09-net
@@ -1,9 +1,6 @@
#!/bin/sh
setup_eth()
{
- for part in $(nvram get unused_ifnames); do
- [ "$part" = "$INTERFACE" ] && exit 0
- done
[ -f /proc/net/wl0 ] && {
lsmod | grep wlcompat >&- || insmod wlcompat
}
@@ -20,8 +17,9 @@ setup_eth()
echo "1" > "/proc/switch/$INTERFACE/reset"
echo "1" > "/proc/switch/$INTERFACE/enable_vlan"
for vlan in $(seq 0 15); do
- [ "$(nvram get vlan${vlan}hwname)" = "$if" ] && {
- vports="$(nvram get vlan${vlan}ports)"
+ eval "hwname=\"\${vlan${vlan}hwname}\""
+ [ "$hwname" = "$if" ] && {
+ eval "vports=\"\${vlan${vlan}ports}\""
[ -n "$vports" ] && echo "$vports" > "/proc/switch/$INTERFACE/vlan/$vlan/ports"
$DEBUG vconfig add "$INTERFACE" "$vlan"
}
diff --git a/target/linux/package/base-files/files/brcm-2.6/etc/hotplug.d/net/09-net b/target/linux/package/base-files/files/brcm-2.6/etc/hotplug.d/net/09-net
index 8670bb4b3..8bbf604df 100644
--- a/target/linux/package/base-files/files/brcm-2.6/etc/hotplug.d/net/09-net
+++ b/target/linux/package/base-files/files/brcm-2.6/etc/hotplug.d/net/09-net
@@ -1,9 +1,6 @@
#!/bin/sh
setup_eth()
{
- for part in $(nvram get unused_ifnames); do
- [ "$part" = "$INTERFACE" ] && exit 0
- done
[ -d /proc/switch ] || {
insmod switch-core
insmod switch-robo || insmod switch-adm
@@ -14,8 +11,9 @@ setup_eth()
echo "1" > "/proc/switch/$INTERFACE/reset"
echo "1" > "/proc/switch/$INTERFACE/enable_vlan"
for vlan in $(seq 0 15); do
- [ "$(nvram get vlan${vlan}hwname)" = "$if" ] && {
- vports="$(nvram get vlan${vlan}ports)"
+ eval "hwname=\"\${vlan${vlan}hwname}\""
+ [ "$hwname" = "$if" ] && {
+ eval "vports=\"\${vlan${vlan}ports}\""
[ -n "$vports" ] && echo "$vports" > "/proc/switch/$INTERFACE/vlan/$vlan/ports"
$DEBUG vconfig add "$INTERFACE" "$vlan"
}
--
2.20.1