X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FLAST%2F50-misc;h=a573f5081e7a95dcf74472725342ff269676f65e;hb=490334746631a6c956eee47947f3ab8f8a451666;hp=eebb3792e3922e684b96be6af9d841a162d7bc3d;hpb=f8e7e925a0eba5b0091354ccf26842bcfda9b84e;p=automated-distro-installer

diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index eebb379..a573f50 100755
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -46,7 +46,7 @@ fi
 
 # Make sure everything is configured properly
 if ifclass DEBIAN ; then
-        $ROOTCMD apt-get -f install
+        $ROOTCMD apt-get -f install -y
 fi
 
 if [ $FAI_ACTION = "install" ]; then
@@ -72,7 +72,7 @@ setrel() {
 	return
     fi
 
-    dists="jessie stretch buster bullseye bookworm bionic xenial trusty"
+    dists="jessie stretch buster bullseye bookworm trixie focal bionic xenial trusty"
     for d in $dists; do
 	if grep -iq $d $target/etc/os-release; then
 	    release=$d
@@ -86,7 +86,7 @@ setrel
 if [ -f $target/etc/apt/sources.list -a -n "$release" ]; then
     grep -q 'file generated by fai-cd' $target/etc/apt/sources.list && cat <<EOF > $target/etc/apt/sources.list
 deb $apt_cdn/debian $release main contrib non-free
-deb $apt_cdn/debian-security $release/updates main contrib non-free
+deb $security_cdn/debian-security ${secsuite} main contrib non-free
 #deb [trusted=yes] http://fai-project.org/download $release koeln
 EOF
     # if the package fai-server was installed, enable the project's repository