projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not print misleading debug message if the snapshot was found correctly.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
23networking
diff --git
a/scripts/live-bottom/23networking
b/scripts/live-bottom/23networking
index
6a66996
..
871d8c0
100755
(executable)
--- a/
scripts/live-bottom/23networking
+++ b/
scripts/live-bottom/23networking
@@
-18,7
+18,7
@@
case "${1}" in
;;
esac
;;
esac
-# live-
initramfs
header
+# live-
boot
header
if [ -n "${NONETWORKING}" ]
then
if [ -n "${NONETWORKING}" ]
then
@@
-29,7
+29,7
@@
fi
log_begin_msg "Preconfiguring networking"
log_begin_msg "Preconfiguring networking"
-# live-
initramfs
script
+# live-
boot
script
IFFILE="/root/etc/network/interfaces"
IFFILE="/root/etc/network/interfaces"
@@
-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
@@
-79,7
+71,7
@@
EOF
done
else
done
else
- if [ -z "${NETBOOT}" ]
+ if [ -z "${NETBOOT}" ]
|| [ -n "${DHCP}" ]
then
# default, dhcp assigned
method="dhcp"
then
# default, dhcp assigned
method="dhcp"
@@
-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
@@
-127,7
+119,7
@@
EOF
cat > /root/etc/resolv.conf << EOF
# /etc/resolv.conf
cat > /root/etc/resolv.conf << EOF
# /etc/resolv.conf
-# Autogenerated by live-
initramfs
+# Autogenerated by live-
boot
search ${rc_search}
domain ${rc_search}
${rc_server0}
search ${rc_search}
domain ${rc_search}
${rc_server0}