projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating matching in is_nice_device to, amongst others, match for virtio devices.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
c2ad14e
..
2dc0a7e
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-485,7
+485,7
@@
is_nice_device ()
{
sysfs_path="${1#/sys}"
{
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]$'
then
return 0
elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@
-1683,7
+1683,7
@@
check_dev ()
echo ${mountpoint}
return 0
else
echo ${mountpoint}
return 0
else
- umount ${mountpoint}
+ umount ${mountpoint}
2>/dev/null
fi
fi
fi
fi