X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F23networking;h=aeff35170de276f145b0c58d50e962d9ccdf5154;hb=6a3e789117d7c4254aee7905e0c3065a5202d79f;hp=c6ec9cc8c4b272aada8806d5e837e3df40d945bb;hpb=13040ad5e4f230cdfecd278a3bf134110fc48f87;p=live-boot-grml.git

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index c6ec9cc..aeff351 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -82,10 +82,12 @@ else
 	fi
 
 	# iterate the physical interfaces and add them to the interfaces list
-	for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
-	do
-		[ -e $interface ] || continue
-		i="$(basename $interface)"
+	if [ "$method" != dhcp ] || [ ! -x /root/usr/sbin/NetworkManager ]
+	then
+		for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
+		do
+			[ -e $interface ] || continue
+			i="$(basename $interface)"
 
 cat >> "$IFFILE" << EOF
 auto $i
@@ -93,7 +95,8 @@ iface $i inet $method
 
 EOF
 
-	done
+		done
+	fi
 
 	if [ ! -f /root/etc/resolv.conf -a -f /netboot.config ]
 	then
@@ -125,9 +128,11 @@ EOF
 	fi
 fi
 
-#for i in eth0 eth1 eth2 ath0 wlan0
-#do
-#	grep -q "iface $i" $IFFILE && continue
+#if [ ! -x /root/usr/sbin/NetworkManager ]
+#then
+#	for i in eth0 eth1 eth2 ath0 wlan0
+#	do
+#		grep -q "iface $i" $IFFILE && continue
 #
 #cat >> "$IFFILE" << EOF
 #auto $i
@@ -135,6 +140,7 @@ fi
 #
 #EOF
 #
-#done
+#	done
+#fi
 
 log_end_msg