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 c2d6b5c85327a891a9527ab02ec760553c05a500..2b41683cdc664e6033efaed5241fbd685580ae26 100755 (executable)
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -48,8 +48,7 @@ fi
 
 # Make sure everything is configured properly
 if ifclass DEBIAN || ifclass UBUNTU; then
-        echo "Running \"apt-get -f install\" for the last time."
-        $ROOTCMD apt-get -f install
+        $ROOTCMD apt-get -f install -y
 fi
 
 if [ $FAI_ACTION = "install" ]; then
@@ -75,7 +74,7 @@ setrel() {
        return
     fi
 
-    dists="jessie stretch buster bullseye bookworm bionic xenial trusty"
+    dists="jessie stretch buster bullseye bookworm focal bionic xenial trusty"
     for d in $dists; do
        if grep -iq $d $target/etc/os-release; then
            release=$d