summaryrefslogtreecommitdiff
path: root/scripts/live-bottom
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-07-15 23:42:33 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:00 +0100
commit058dcef0d8013a45c5f289f91d08b036860aea94 (patch)
treedb142ab62497146846edbea550348d958f17593c /scripts/live-bottom
parent883234b7943f93dc33ee5f237c9183973a5090f4 (diff)
downloadlive-boot-058dcef0d8013a45c5f289f91d08b036860aea94.tar.gz
live-boot-058dcef0d8013a45c5f289f91d08b036860aea94.zip
Replacing previous imperfect changes for udevadm with check for udevadm and using old commands when beeing on etch. Also handling udevtrigger with udevadm if available.
Diffstat (limited to 'scripts/live-bottom')
-rwxr-xr-xscripts/live-bottom/23networking12
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 429a135..5e9afe9 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -46,8 +46,16 @@ iface lo inet loopback
EOF
-udevadm trigger
-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