summaryrefslogtreecommitdiffstats
path: root/abs/mv-core
diff options
context:
space:
mode:
Diffstat (limited to 'abs/mv-core')
-rw-r--r--abs/mv-core/MythVantage-config/networkconfig.sh41
1 files changed, 20 insertions, 21 deletions
diff --git a/abs/mv-core/MythVantage-config/networkconfig.sh b/abs/mv-core/MythVantage-config/networkconfig.sh
index 999ccb0..9ad2d4e 100644
--- a/abs/mv-core/MythVantage-config/networkconfig.sh
+++ b/abs/mv-core/MythVantage-config/networkconfig.sh
@@ -78,9 +78,13 @@ function setup_interfaces() {
TEMPNET=HostGW$1
eval GW=\$${TEMPNET}
+ TEMPNET=HOST_iswireless$1
+ eval wireless=\$${TEMPNET}
- if [ $1 = wlan0 -o $1 = wlan1 ]
+
+
+ if [ x$wireless = x1 ]
then
IS_WIRELESS=TRUE
TEMPNET=HostESSID$1
@@ -193,30 +197,25 @@ kill_dhcp
}
function vnc_check() {
- if [ x$RESTART_NETWORK = xfalse ]
+ CMDLINE=$(cat /proc/cmdline)
+ echo $CMDLINE |grep -q vnc
+ USEVNC=$?
+ echo $CMDLINE |grep -q nfsroot
+ NETBOOT=$?
+ echo $USEVNC
+ if [ ! x$USEVNC = x0 ]
then
- echo "netboot install or image creating, will not restart network"
- USEVNC=0
- else
- CMDLINE=$(cat /proc/cmdline)
- echo $CMDLINE |grep -q vnc
- USEVNC=$?
- echo $CMDLINE |grep -q nfsroot
- NETBOOT=$?
- echo $USEVNC
- if [ ! x$USEVNC = x0 ]
+ echo "not using vnc"
+ if [ ! x$NETBOOT = x0 ]
then
- echo "not using vnc"
- if [ ! x$NETBOOT = x0 ]
- then
- echo "not using netboot"
- else
- echo "using netboot"
- USEVNC=0
- fi
+ echo "not using netboot"
else
- echo " using vnc"
+ echo "using netboot"
+ USEVNC=0
fi
+
+ else
+ echo " using vnc"
fi
}