X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FLAST%2F50-misc;h=831f15d6f288fdf380d23d30257c6101167fcec7;hb=051fc89e27bd812a1a45292f6d2a18803ce6f394;hp=2b41683cdc664e6033efaed5241fbd685580ae26;hpb=fe81034ee9664d8e131bac218b40d99a58a31649;p=automated-distro-installer

diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index 2b41683..831f15d 100755
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -74,7 +74,7 @@ setrel() {
 	return
     fi
 
-    dists="jessie stretch buster bullseye bookworm focal bionic xenial trusty"
+    dists="jessie stretch buster bullseye bookworm trixie jammy focal bionic xenial trusty aramo nabia etiona"
     for d in $dists; do
 	if grep -iq $d $target/etc/os-release; then
 	    release=$d
@@ -88,11 +88,11 @@ 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
-    if [ -f $target/var/lib/dpkg/info/fai-server.list ]; then
+    if dpkg-query --admindir=$target/var/lib/dpkg -W fai-server >/dev/null 2>&1; then
 	sed -i -e '/fai-project.org/s/^#//' $target/etc/apt/sources.list
     fi
 fi