Kaynağa Gözat

remove extra else

Alfonso Gamboa 4 yıl önce
ebeveyn
işleme
9013eeb466
1 değiştirilmiş dosya ile 22 ekleme ve 18 silme
  1. 22 18
      SD_ROOT/wz_mini/run_mmc.sh

+ 22 - 18
SD_ROOT/wz_mini/run_mmc.sh

@@ -2,41 +2,45 @@
 
 DISABLE_FW_UPGRADE="false"
 HOSTNAME="WCV3_spare_test"
+ENABLE_USB_ETH="false"
+ENABLE_USB_DIRECT="false"
 
 echo  "run_mmc.sh start" > /dev/kmsg
 
-echo "check if ethernet adapter is present"
- if [[ ! -d /sys/class/net/eth* ]]; then
-        echo "usb ethernet not present"
-	if [[ ! -d /sys/class/net/usb0* ]]; then
-        	echo "usb host not present"
-	else
-	##ONLY WORKS WITH g_ethernet enabled kernel
-        ifconfig usb0 down
+if [[ "$ENABLE_USB_ETH" == "true" ]]; then
+        ifconfig eth0 down
         ifconfig wlan0 down
-	/media/mmc/wz_mini/bin/busybox ip link set wlan0 address 02:01:02:03:04:08
-        /media/mmc/wz_mini/bin/busybox ip link set wlan0 name wlanold
-        /media/mmc/wz_mini/bin/busybox ip link set usb0 name wlan0
+
+        /media/mmc/wz_mini/bin/busybox  ip link set wlan0 name wlanold
+        /media/mmc/wz_mini/bin/busybox  ip link set eth0 name wlan0
 
         ifconfig wlan0 up
         udhcpc -i wlan0
         /media/mmc/wz_mini/bin/dropbearmulti dropbear -R -m &
         sleep 5
         mount -o bind /media/mmc/wz_mini/bin/wpa_cli.sh /bin/wpa_cli
-	fi
-    else
-        ifconfig eth0 down
-        ifconfig wlan0 down
+	else
+	        echo "usb ethernet disabled"
+fi
 
-        /media/mmc/wz_mini/bin/busybox  ip link set wlan0 name wlanold
-        /media/mmc/wz_mini/bin/busybox  ip link set eth0 name wlan0
+
+if [[ "$ENABLE_USB_DIRECT" == "true" ]]; then
+#	if [[ ! -d /sys/class/net/usb0* ]]; then
+	##ONLY WORKS WITH g_ethernet enabled kernel
+        ifconfig usb0 down
+        ifconfig wlan0 down
+	/media/mmc/wz_mini/bin/busybox ip link set wlan0 address 02:01:02:03:04:08
+        /media/mmc/wz_mini/bin/busybox ip link set wlan0 name wlanold
+        /media/mmc/wz_mini/bin/busybox ip link set usb0 name wlan0
 
         ifconfig wlan0 up
         udhcpc -i wlan0
         /media/mmc/wz_mini/bin/dropbearmulti dropbear -R -m &
         sleep 5
         mount -o bind /media/mmc/wz_mini/bin/wpa_cli.sh /bin/wpa_cli
-    fi
+	else
+		echo "usb direct disabled"
+fi
 
 if [[ "$DISABLE_FW_UPGRADE" == "true" ]]; then
 	mkdir /tmp/Upgrade