X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=96ab63a044df0261739a8080648a0d3ee21003c2;hb=088e23d8225c53f92bc12125d95a11e165869a9a;hp=9baf5a957b5cc528453237d1db3cdd742145c6e9;hpb=a16e96b9f2baf702da7104d6ccd3bf61dbd49319;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index 9baf5a9..96ab63a 100755
--- a/scripts/live
+++ b/scripts/live
@@ -762,16 +762,8 @@ do_netmount ()
 
 	modprobe -q af_packet # For DHCP
 
-	if [ -x /sbin/udevadm ]
-	then
-		# lenny
-		udevadm trigger
-		udevadm settle
-	else
-		# etch
-		udevtrigger
-		udevsettle
-	fi
+	udevadm trigger
+	udevadm settle
 
 	ipconfig ${DEVICE} | tee /netboot.config
 
@@ -996,7 +988,7 @@ find_snap ()
 	if [ "${PERSISTENT}" != "nofiles" ]
 	then
 		# search for image files
-		snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.ext4 ${snap_label}.jffs2")
+		snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2")
 	fi
 
 	if [ -z "${snapdata}" ]
@@ -1109,7 +1101,7 @@ setup_unionfs ()
 
 	if [ "${UNIONTYPE}" = "aufs" ]
 	then
-		roopt="rr,xino=/tmp/aufs.xino"
+		roopt="rr,noxino"
 	else
 		roopt="ro"
 	fi
@@ -1232,16 +1224,8 @@ setup_unionfs ()
 				modprobe -q -b ${module}
 			done
 
-			if [ -x /sbin/udevadm ]
-			then
-				# lenny
-				udevadm trigger
-				udevadm settle
-			else
-				# etch
-				udevtrigger
-				udevsettle
-			fi
+			udevadm trigger
+			udevadm settle
 
 			# For some reason, udevsettle does not block in this scenario,
 			# so we sleep for a little while.