X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=f4a4029c067e9eebbd2212a65ad91684dc7551f5;hb=refs%2Ftags%2Fdebian%2F1.136.1-1;hp=e2112638f44c07089d1731dc35fabb9ed7c085fa;hpb=03dc8cc3445af502900bd0002ea584bfbc8d0b1a;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index e211263..f4a4029 100755
--- a/scripts/live
+++ b/scripts/live
@@ -456,7 +456,7 @@ Arguments ()
 
 	if [ -z "${UNIONTYPE}" ]
 	then
-		UNIONTYPE="unionfs"
+		UNIONTYPE="aufs"
 		export UNIONTYPE
 	fi
 }
@@ -650,7 +650,7 @@ do_netmount ()
 
 	modprobe -q af_packet # For DHCP
 
-	udevtrigger
+	udevadm trigger
 	udevsettle
 
 	ipconfig ${DEVICE} | tee /netboot.config
@@ -1041,7 +1041,7 @@ setup_unionfs ()
 			modprobe -q -b ${module}
 		done
 
-		udevtrigger
+		udevadm trigger
 		udevsettle
 
 		# For some reason, udevsettle does not block in this scenario,
@@ -1064,10 +1064,12 @@ setup_unionfs ()
 		then
 			cowdevice=${cowprobe}
 			cow_fstype=$(get_fstype "${cowprobe}")
+			cow_mountopt="rw,noatime"
 		else
 			[ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium"
 			cowdevice="tmpfs"
 			cow_fstype="tmpfs"
+			cow_mountopt="rw,noatime,mode=755"
 		fi
 	elif [ -n "${NFS_COW}" ] && [ -z "${NOPERSISTENT}" ]
 	then
@@ -1100,7 +1102,7 @@ setup_unionfs ()
 		nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
 			panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
 	else
-		mount -t ${cow_fstype} -o rw,noatime ${cowdevice} /cow || \
+		mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
 			panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
 	fi
 
@@ -1192,12 +1194,6 @@ check_dev ()
 		devname=$(sys2dev "${sysdev}")
 	fi
 
-	if [ -n "${LIVE_MEDIA_OFFSET}" ]
-	then
-		loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVE_MEDIA_OFFSET}" '')
-		devname="${loopdevname}"
-	fi
-
 	if [ -d "${devname}" ]
 	then
 		mount -o bind "${devname}" $mountpoint || continue
@@ -1211,6 +1207,12 @@ check_dev ()
 		fi
 	fi
 
+	if [ -n "${LIVE_MEDIA_OFFSET}" ]
+	then
+		loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVE_MEDIA_OFFSET}" '')
+		devname="${loopdevname}"
+	fi
+
 	fstype=$(get_fstype "${devname}")
 
 	if is_supported_fs ${fstype}