fixes for Debian "bullseye" compatibility

2 files changed, 14 insertions, 12 deletions

diff --git a/fsmgr.hs b/fsmgr.hs
index c8ffefb..1c898e3 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -119,18 +119,20 @@ aptListFiles AptListCfg{..} =
   ("/var/lib/apt/lists" </>) .
   (replace "Translation-en" $ "Translation-" ++ translationLang) .
   (replace "amd64" architecture) .
-  (replace "buster" releaseCodename) <$> observedCorrectListForBuster
+  (if (releaseCodename == "stretch" || releaseCodename == "buster")
+  then replace "-security" "_updates" <$> (replace "bullseye" releaseCodename)
+  else id) <$> observedCorrectListForBullseye
   where
-    observedCorrectListForBuster =
-      [ "httpredir.debian.org_debian_dists_buster_InRelease"
-      , "httpredir.debian.org_debian_dists_buster_main_binary-amd64_Packages"
-      , "httpredir.debian.org_debian_dists_buster_main_i18n_Translation-en"
-      , "httpredir.debian.org_debian_dists_sid_InRelease"
-      , "httpredir.debian.org_debian_dists_sid_main_binary-amd64_Packages"
-      , "httpredir.debian.org_debian_dists_sid_main_i18n_Translation-en"
-      , "security.debian.org_dists_buster_updates_InRelease"
-      , "security.debian.org_dists_buster_updates_main_binary-amd64_Packages"
-      , "security.debian.org_dists_buster_updates_main_i18n_Translation-en"
+    observedCorrectListForBullseye =
+      [ "httpredir.debian.org_debian_dists_bullseye_InRelease"
+      , "httpredir.debian.org_debian_dists_bullseye_main_binary-amd64_Packages"
+      , "httpredir.debian.org_debian_dists_bullseye_main_i18n_Translation-en"
+      -- , "httpredir.debian.org_debian_dists_sid_InRelease"
+      -- , "httpredir.debian.org_debian_dists_sid_main_binary-amd64_Packages"
+      -- , "httpredir.debian.org_debian_dists_sid_main_i18n_Translation-en"
+      , "security.debian.org_dists_bullseye-security_InRelease"
+      , "security.debian.org_dists_bullseye-security_main_binary-amd64_Packages"
+      , "security.debian.org_dists_bullseye-security_main_i18n_Translation-en"
       ]
 
 buildRoot :: DiskImageConfig -> FilePath -> Action ()
diff --git a/selfstrap b/selfstrap
index d3d9351..e6b7015 100755
--- a/selfstrap
+++ b/selfstrap
@@ -216,7 +216,7 @@ write_sources_list()
             printf '%s\n' \
                    "deb  ${debian_mirror}           ${target_release}            main  contrib  non-free"  \
                    "deb  ${debian_mirror}           ${target_release}-backports  main  contrib  non-free"  \
-                   "deb  ${debian_security_mirror}  ${target_release}/updates    main  contrib  non-free"
+                   "deb  ${debian_security_mirror}  ${target_release}$_updates   main  contrib  non-free"
         fi
         if apt policy | grep -q ' sid/'
         then