X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=e69396e10cd8606f665dadbedeb78d805a942b08;hb=dde97bb32a6c30e3329485d2d3e2b35539339b8d;hp=c2ad14e1f8700214972a621ca905edeb323decf9;hpb=41112e3945280cb19dab1fed2b224a763e97fe55;p=live-boot-grml.git

diff --git a/scripts/live b/scripts/live
index c2ad14e..e69396e 100755
--- a/scripts/live
+++ b/scripts/live
@@ -485,7 +485,7 @@ is_nice_device ()
 {
 	sysfs_path="${1#/sys}"
 
-	if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
+	if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
 	then
 		return 0
 	elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -1204,7 +1204,7 @@ setup_unionfs ()
 
 	if [ "${UNIONTYPE}" = "aufs" ]
 	then
-		roopt="rr"
+		roopt="rr+wh"
 		noxino_opt="noxino,"
 	elif [ "${UNIONTYPE}" = "unionfs-fuse" ]
 	then
@@ -1683,7 +1683,7 @@ check_dev ()
 			echo ${mountpoint}
 			return 0
 		else
-			umount ${mountpoint}
+			umount ${mountpoint} 2>/dev/null
 		fi
 	fi