Remove security repository etc. for sid/unstable

debi.sh

@@ -86,7 +86,7 @@ mirror_protocol=http
 mirror_host=deb.debian.org
 mirror_directory=/debian
 security_repository=http://security.debian.org/debian-security
-security_archive=$suite/updates
+security_archive=buster/updates
 account_setup=true
 username=debian
 password=
@@ -157,14 +157,18 @@ while [ $# -gt 0 ]; do
             case $2 in
                 9|stretch)
                     suite=stretch
+                    daily_d_i=false
+                    security_archive=stretch/updates
                     ;;
                 10|buster)
                     suite=buster
+                    daily_d_i=false
+                    security_archive=buster/updates
                     ;;
                 11|bullseye)
                     suite=bullseye
                     daily_d_i=true
-                    security_archive=$suite-security
+                    security_archive=bullseye-security
                     ;;
                 *)
                     err "Unsupported version: $2"
@@ -174,13 +178,17 @@ while [ $# -gt 0 ]; do
         --suite)
             suite=$2
             case $2 in
-                bullseye)
+                bullseye|testing)
                     daily_d_i=true
-                    security_archive=$suite-security
+                    security_archive="$suite-security"
                     ;;
-                testing|sid|unstable)
+                sid|unstable)
                     daily_d_i=true
-                    security_archive=testing-security
+                    security_archive=''
+                    ;;
+                *)
+                    daily_d_i=false
+                    security_archive="$suite/updates"
             esac
             shift
             ;;
@@ -602,7 +610,9 @@ EOF
 
 [ "$security_repository" = mirror ] && security_repository=$mirror_protocol://$mirror_host${mirror_directory%/*}/debian-security
 
-$save_preseed << EOF
+# If not sid/unstable
+[ -n "$security_archive" ] && {
+    $save_preseed << EOF
 
 # Apt setup
 
@@ -611,6 +621,8 @@ d-i apt-setup/local0/repository string $security_repository $security_archive ma
 d-i apt-setup/local0/source boolean true
 EOF
 
+}
+
 $save_preseed << 'EOF'
 
 # Package selection