X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FLAST%2F50-misc;h=4627697ecea58fc7b859c6a6abf2037e39eaaa0f;hp=2a8f2f129a6b47faa295b2f34ed6507595317d2d;hb=da61a304a10de72288782a9d872769fe44576f50;hpb=06d7ec6b13af05465b2d88998be2bfbe7c3c43d6 diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc index 2a8f2f1..4627697 100755 --- a/fai/config/scripts/LAST/50-misc +++ b/fai/config/scripts/LAST/50-misc @@ -15,14 +15,13 @@ else fi fi - # # commented because it does false possitive - # usedm=$(dmsetup ls | egrep -v '^live-rw|^live-base|^No devices found' | wc -l) - # if [ $usedm -ne 0 ]; then - # if [ ! -d $target/etc/lvm ]; then - # echo ERROR: Found lvm devices, but the lvm2 package was not installed - # error=1 - # fi - # fi + usedm=$(dmsetup ls 2>/dev/null | egrep -v '^live-rw|^live-base|^No devices found' | wc -l) + if [ $usedm -ne 0 ]; then + if [ ! -d $target/etc/lvm ]; then + echo ERROR: Found lvm devices, but the lvm2 package was not installed + error=1 + fi + fi fi # remove backup files from cfengine, but only if cfengine is installed @@ -71,7 +70,7 @@ setrel() { return fi - dists="jessie stretch xenial trusty" + dists="jessie stretch buster xenial trusty" for d in $dists; do if grep -iq $d $target/etc/os-release; then release=$d