X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-overlay.sh;h=d1b9cef44d3479c3eb4cf1d5711c38c82c6ee7bf;hb=202dc5012543bcfcc6b535b90ca1c652241f7eb2;hp=25192c5476fba004c0008180b9351504976d7c3a;hpb=5314f34b98a48f324a5e2dbf090837c252f27fee;p=live-boot-grml.git diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh index 25192c5..d1b9cef 100755 --- a/components/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -190,7 +190,7 @@ setup_unionfs () if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD} then - overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label} ${old_custom_overlay_label}" + overlays="${custom_overlay_label}" fi local overlay_devices @@ -202,27 +202,10 @@ setup_unionfs () media="$(echo ${media} | tr ":" " ")" case ${media} in - ${old_root_overlay_label}=*) - device="${media#*=}" - fix_backwards_compatibility ${device} / union - overlay_devices="${overlay_devices} ${device}" - ;; - - ${old_home_overlay_label}=*) - device="${media#*=}" - fix_backwards_compatibility ${device} /home bind - overlay_devices="${overlay_devices} ${device}" - ;; - ${custom_overlay_label}=*) device="${media#*=}" overlay_devices="${overlay_devices} ${device}" ;; - - ${old_custom_overlay_label}=*) - device="${media#*=}" - overlay_devices="${overlay_devices} ${device}" - ;; esac done fi @@ -291,7 +274,7 @@ setup_unionfs () panic "only one RO file system supported with exposedroot: ${rootfslist}" fi - mount --bind ${rootfs} ${rootmnt} || \ + mount -o bind ${rootfs} ${rootmnt} || \ panic "bind mount of ${rootfs} failed" if [ -z "${SKIP_UNION_MOUNTS}" ]