X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=5af7ad8e93dedb6047859ce68f4c3eea56c12851;hb=d98b500c721b2bd5319d84f1e38a2e54db043834;hp=1b5c89e51def57b2d810c90c9061f6d5600bfd3e;hpb=f88546749c32ecf41bf31871507aa012af4e807b;p=live-boot-grml.git diff --git a/scripts/live b/scripts/live index 1b5c89e..5af7ad8 100755 --- a/scripts/live +++ b/scripts/live @@ -536,7 +536,7 @@ is_nice_device () PATH_ID="/sbin/udevadm test-builtin path_id" fi - if "${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)" + if ${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]$' @@ -1208,7 +1208,7 @@ setup_unionfs () addimage_directory="${3}" case ${UNIONTYPE} in - aufs|unionfs) + aufs|unionfs|overlayfs) modprobe -q -b ${UNIONTYPE} if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ] @@ -1570,6 +1570,10 @@ setup_unionfs () mount_full $unionmountopts "${unionmountpoint}" ;; + overlayfs) + unionmountopts="-o noatime,${noxino_opt},lowerdir=${unionro},upperdir=${unionrw}" + mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}" + ;; *) if [ -n "${PERSISTENT_READONLY}" ]