Merge branch 'upstream'

[automated-distro-installer] / fai / config / scripts / LAST / 50-misc

diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index a1cf1d1eaa4ef49e33b77f758b640fa3d9f4afac..4627697ecea58fc7b859c6a6abf2037e39eaaa0f 100755 (executable)
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -15,7 +15,7 @@ else
     fi
   fi
 
-  usedm=$(dmsetup ls | egrep -v '^live-rw|^live-base|^No devices found' | wc -l)
+  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
@@ -45,7 +45,7 @@ if [ $do_init_tasks -eq 1 ] ; then
 fi
 
 # Make sure everything is configured properly
-if ifclass DEBIAN ; then
+if ifclass DEBIAN || ifclass UBUNTU; then
         echo "Running \"apt-get -f install\" for the last time."
         $ROOTCMD apt-get -f install
 fi
@@ -70,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