[SCM] live-boot branch, debian-next, updated. debian/3.0_a21-1-2-g1e18888

Daniel Baumann daniel at debian.org
Sat Oct 29 16:01:21 UTC 2011


The following commit has been merged in the debian-next branch:
commit 1e188882b331d28e12cba5533a588837ff52743a
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Oct 29 18:01:00 2011 +0200

    Updating matching in is_nice_device to, amongst others, match for virtio devices.

diff --git a/scripts/live b/scripts/live
index 5fb8a26..26ff846 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
 	then
 		return 0
 	elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'

-- 
live-boot



More information about the debian-live-changes mailing list