diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 15:12:05 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:05 +0100 |
| commit | 6a3e789117d7c4254aee7905e0c3065a5202d79f (patch) | |
| tree | df13019d85c55473ae8c223fc8d4a86d7b8a987a /scripts/live-bottom/23networking | |
| parent | 13040ad5e4f230cdfecd278a3bf134110fc48f87 (diff) | |
| download | live-boot-6a3e789117d7c4254aee7905e0c3065a5202d79f.tar.gz live-boot-6a3e789117d7c4254aee7905e0c3065a5202d79f.zip | |
Merging casper 1.103.
Diffstat (limited to 'scripts/live-bottom/23networking')
| -rwxr-xr-x | scripts/live-bottom/23networking | 24 |
1 files changed, 15 insertions, 9 deletions
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 |