projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.203.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
23networking
diff --git
a/scripts/live-bottom/23networking
b/scripts/live-bottom/23networking
index
5e9afe9
..
4ebb944
100755
(executable)
--- a/
scripts/live-bottom/23networking
+++ b/
scripts/live-bottom/23networking
@@
-27,7
+27,7
@@
fi
. /scripts/live-functions
. /scripts/live-functions
-log_begin_msg "Preconfiguring networking
...
"
+log_begin_msg "Preconfiguring networking"
# live-initramfs script
# live-initramfs script
@@
-46,16
+46,8
@@
iface lo inet loopback
EOF
EOF
-if [ -x /sbin/udevadm ]
-then
- # lenny
- udevadm trigger
- udevadm settle
-else
- # etch
- udevtrigger
- udevsettle
-fi
+udevadm trigger
+udevadm settle
if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
then
if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
then
@@
-90,7
+82,7
@@
else
fi
# iterate the physical interfaces and add them to the interfaces list
fi
# iterate the physical interfaces and add them to the interfaces list
- if [ "${method}" != dhcp ] ||
[ ! -x /root/usr/sbin/NetworkManager ]
+ if [ "${method}" != dhcp ] ||
([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ])
then
for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
do
then
for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
do