X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=15710c29b3e0b131adcc69ecc863c8cc8c93dc2f;hb=058dcef0d8013a45c5f289f91d08b036860aea94;hp=fcaf1ec96676e33be2c1e9c3434b6a5f4fea5811;hpb=ee9e8d389f1ee6ccda3cf1726884b98c34847158;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index fcaf1ec..15710c2 100755
--- a/scripts/live
+++ b/scripts/live
@@ -456,7 +456,7 @@ Arguments ()
 
 	if [ -z "${UNIONTYPE}" ]
 	then
-		UNIONTYPE="unionfs"
+		UNIONTYPE="aufs"
 		export UNIONTYPE
 	fi
 }
@@ -650,8 +650,16 @@ do_netmount ()
 
 	modprobe -q af_packet # For DHCP
 
-	udevadm trigger
-	udevsettle
+	if [ -x /sbin/udevadm ]
+	then
+		# lenny
+		udevadm trigger
+		udevadm settle
+	else
+		# etch
+		udevtrigger
+		udevsettle
+	fi
 
 	ipconfig ${DEVICE} | tee /netboot.config
 
@@ -1041,8 +1049,16 @@ setup_unionfs ()
 			modprobe -q -b ${module}
 		done
 
-		udevadm trigger
-		udevsettle
+		if [ -x /sbin/udevadm ]
+		then
+			# lenny
+			udevadm trigger
+			udevadm settle
+		else
+			# etch
+			udevtrigger
+			udevsettle
+		fi
 
 		# For some reason, udevsettle does not block in this scenario,
 		# so we sleep for a little while.