projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enabling whiteouts support for aufs.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
5fb8a26
..
e69396e
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]$'
@@
-1204,7
+1204,7
@@
setup_unionfs ()
if [ "${UNIONTYPE}" = "aufs" ]
then
if [ "${UNIONTYPE}" = "aufs" ]
then
- roopt="rr"
+ roopt="rr
+wh
"
noxino_opt="noxino,"
elif [ "${UNIONTYPE}" = "unionfs-fuse" ]
then
noxino_opt="noxino,"
elif [ "${UNIONTYPE}" = "unionfs-fuse" ]
then