1 files changed, 42 insertions, 13 deletions

diff --git a/fsmgr.hs b/fsmgr.hs
index f3d7af0..d2c7100 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -119,20 +119,49 @@ aptListFiles AptListCfg{..} =
   ("/var/lib/apt/lists" </>) .
   (replace "Translation-en" $ "Translation-" ++ translationLang) .
   (replace "amd64" architecture) .
-  (if (releaseCodename == "stretch" || releaseCodename == "buster")
-  then replace "-security" "_updates" <$> (replace "bullseye" releaseCodename)
-  else id) <$> observedCorrectListForBullseye
+  (if (releaseCodename == "bookworm") then id
+  else replace "bookworm" releaseCodename) <$>
+       observedCorrectListForBookworm
   where
-    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"
-      , "security.debian.org_debian-security_dists_bullseye-security_InRelease"
-      , "security.debian.org_debian-security_dists_bullseye-security_main_binary-amd64_Packages"
-      , "security.debian.org_debian-security_dists_bullseye-security_main_i18n_Translation-en"
-      , "security.debian.org_debian-security_dists_bullseye-security_non-free_binary-amd64_Packages"
-      , "security.debian.org_debian-security_dists_bullseye-security_non-free_i18n_Translation-en"
-      ]
+
+observedCorrectListForBookworm =
+  [ "httpredir.debian.org_debian_dists_bookworm-backports_contrib_binary-amd64_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm-backports_contrib_binary-i386_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm-backports_contrib_i18n_Translation-en"
+  , "httpredir.debian.org_debian_dists_bookworm-backports_InRelease"
+  , "httpredir.debian.org_debian_dists_bookworm-backports_main_binary-amd64_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm-backports_main_binary-i386_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm-backports_main_i18n_Translation-en"
+  , "httpredir.debian.org_debian_dists_bookworm-backports_non-free_binary-amd64_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm-backports_non-free_binary-i386_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm-backports_non-free_i18n_Translation-en"
+  , "httpredir.debian.org_debian_dists_bookworm_contrib_binary-amd64_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm_contrib_binary-i386_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm_contrib_i18n_Translation-en"
+  , "httpredir.debian.org_debian_dists_bookworm_InRelease"
+  , "httpredir.debian.org_debian_dists_bookworm_main_binary-amd64_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm_main_binary-i386_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm_main_i18n_Translation-en"
+  , "httpredir.debian.org_debian_dists_bookworm_non-free_binary-amd64_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm_non-free_binary-i386_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm_non-free-firmware_binary-amd64_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm_non-free-firmware_binary-i386_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm_non-free-firmware_i18n_Translation-en"
+  , "httpredir.debian.org_debian_dists_bookworm_non-free_i18n_Translation-en"
+  , "httpredir.debian.org_debian_dists_bookworm-updates_InRelease"
+  , "httpredir.debian.org_debian_dists_bookworm-updates_main_binary-amd64_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm-updates_main_binary-i386_Packages"
+  , "httpredir.debian.org_debian_dists_bookworm-updates_main_i18n_Translation-en"
+  , "httpredir.debian.org_debian-security_dists_bookworm-security_contrib_binary-amd64_Packages"
+  , "httpredir.debian.org_debian-security_dists_bookworm-security_contrib_i18n_Translation-en"
+  , "httpredir.debian.org_debian-security_dists_bookworm-security_InRelease"
+  , "httpredir.debian.org_debian-security_dists_bookworm-security_main_binary-amd64_Packages"
+  , "httpredir.debian.org_debian-security_dists_bookworm-security_main_binary-i386_Packages"
+  , "httpredir.debian.org_debian-security_dists_bookworm-security_main_i18n_Translation-en"
+  , "httpredir.debian.org_debian-security_dists_bookworm-security_non-free-firmware_binary-amd64_Packages"
+  , "httpredir.debian.org_debian-security_dists_bookworm-security_non-free-firmware_binary-i386_Packages"
+  , "httpredir.debian.org_debian-security_dists_bookworm-security_non-free-firmware_i18n_Translation-en"
+  ]
 
 buildRoot :: DiskImageConfig -> FilePath -> Action ()
 buildRoot config@DiskImageConfig{..} finalOut = do