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.151.
[live-boot-grml.git]
/
scripts
/
live-bottom
/
23networking
diff --git
a/scripts/live-bottom/23networking
b/scripts/live-bottom/23networking
index
6c726c6
..
6a66996
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,8
+46,16
@@
iface lo inet loopback
EOF
EOF
-udevtrigger
-udevsettle
+if [ -x /sbin/udevadm ]
+then
+ # lenny
+ udevadm trigger
+ udevadm settle
+else
+ # etch
+ udevtrigger
+ udevsettle
+fi
if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
then
if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
then