X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=components%2F9990-misc-helpers.sh;h=5a4c8b847d915b8217cef212b7e51d8f1f35f2c7;hb=5314f34b98a48f324a5e2dbf090837c252f27fee;hp=6f7b59955f402e90594ebaca53f9525c31161e48;hpb=a70d21e8afab8f19bd88e36b5e072cdc9d6faf65;p=live-boot-grml.git diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh index 6f7b599..5a4c8b8 100755 --- a/components/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -150,7 +150,7 @@ check_dev () ISO_DEVICE=$(dirname ${ISO_DEVICE}) [ -b "$ISO_DEVICE" ] && break i=$(($i -1)) - done + done fi if [ "$ISO_DEVICE" = "/" ] @@ -1103,18 +1103,18 @@ find_persistence_media () result=$(probe_for_file_name "${overlays}" ${dev}) if [ -n "${result}" ] then - local loopdevice + local loopdevice loopdevice=${result##*=} - if is_in_comma_sep_list luks ${PERSISTENCE_ENCRYPTION} && is_luks_partition ${loopdevice} + if is_in_comma_sep_list luks ${PERSISTENCE_ENCRYPTION} && is_luks_partition ${loopdevice} then - local luksfile + local luksfile luksfile="" if luksfile=$(open_luks_device "${loopdevice}") then - result=${result%%=*} + result=${result%%=*} result="${result}=${luksfile}" else - losetup -d $loopdevice + losetup -d $loopdevice result="" fi fi @@ -1646,6 +1646,32 @@ activate_custom_mounts () echo ${used_devices} } +fix_backwards_compatibility () +{ + local device dir opt backing include_list + device=${1} + dir=${2} + opt=${3} + + if [ -n "${PERSISTENCE_READONLY}" ] + then + return + fi + + backing="$(mount_persistence_media ${device})" + if [ -z "${backing}" ] + then + return + fi + + include_list="${backing}/${persistence_list}" + if [ ! -r "${include_list}" ] && [ ! -r "${backing}/${old_persistence_list}" ] + then + echo "# persistence backwards compatibility: +${dir} ${opt},source=." > "${include_list}" + fi +} + is_mountpoint () { directory="$1"