1 files changed, 13 insertions, 11 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 =
+    observedCorrectListForBullseye =
-      [ "httpredir.debian.org_debian_dists_buster_InRelease"
+      [ "httpredir.debian.org_debian_dists_bullseye_InRelease"
-      , "httpredir.debian.org_debian_dists_buster_main_binary-amd64_Packages"
+      , "httpredir.debian.org_debian_dists_bullseye_main_binary-amd64_Packages"
-      , "httpredir.debian.org_debian_dists_buster_main_i18n_Translation-en"
+      , "httpredir.debian.org_debian_dists_bullseye_main_i18n_Translation-en"
-      , "httpredir.debian.org_debian_dists_sid_InRelease"
+      -- , "httpredir.debian.org_debian_dists_sid_InRelease"
-      , "httpredir.debian.org_debian_dists_sid_main_binary-amd64_Packages"
+      -- , "httpredir.debian.org_debian_dists_sid_main_binary-amd64_Packages"
-      , "httpredir.debian.org_debian_dists_sid_main_i18n_Translation-en"
+      -- , "httpredir.debian.org_debian_dists_sid_main_i18n_Translation-en"
-      , "security.debian.org_dists_buster_updates_InRelease"
+      , "security.debian.org_dists_bullseye-security_InRelease"
-      , "security.debian.org_dists_buster_updates_main_binary-amd64_Packages"
+      , "security.debian.org_dists_bullseye-security_main_binary-amd64_Packages"
-      , "security.debian.org_dists_buster_updates_main_i18n_Translation-en"
+      , "security.debian.org_dists_bullseye-security_main_i18n_Translation-en"
      ]
 buildRoot :: DiskImageConfig -> FilePath -> Action ()

diff --git a/fsmgr.hs b/fsmgr.hs index c8ffefb..1c898e3 100644 --- a/fsmgr.hs +++ b/fsmgr.hs
@@ -119,18 +119,20 @@ aptListFiles AptListCfg{..} =
119	("/var/lib/apt/lists" </>) .	119	("/var/lib/apt/lists" </>) .
120	(replace "Translation-en" $ "Translation-" ++ translationLang) .	120	(replace "Translation-en" $ "Translation-" ++ translationLang) .
121	(replace "amd64" architecture) .	121	(replace "amd64" architecture) .
122	(replace "buster" releaseCodename) <$> observedCorrectListForBuster	122	(if (releaseCodename == "stretch" \|\| releaseCodename == "buster")
		123	then replace "-security" "_updates" <$> (replace "bullseye" releaseCodename)
		124	else id) <$> observedCorrectListForBullseye
123	where	125	where
124	observedCorrectListForBuster =	126	observedCorrectListForBullseye =
125	[ "httpredir.debian.org_debian_dists_buster_InRelease"	127	[ "httpredir.debian.org_debian_dists_bullseye_InRelease"
126	, "httpredir.debian.org_debian_dists_buster_main_binary-amd64_Packages"	128	, "httpredir.debian.org_debian_dists_bullseye_main_binary-amd64_Packages"
127	, "httpredir.debian.org_debian_dists_buster_main_i18n_Translation-en"	129	, "httpredir.debian.org_debian_dists_bullseye_main_i18n_Translation-en"
128	, "httpredir.debian.org_debian_dists_sid_InRelease"	130	-- , "httpredir.debian.org_debian_dists_sid_InRelease"
129	, "httpredir.debian.org_debian_dists_sid_main_binary-amd64_Packages"	131	-- , "httpredir.debian.org_debian_dists_sid_main_binary-amd64_Packages"
130	, "httpredir.debian.org_debian_dists_sid_main_i18n_Translation-en"	132	-- , "httpredir.debian.org_debian_dists_sid_main_i18n_Translation-en"
131	, "security.debian.org_dists_buster_updates_InRelease"	133	, "security.debian.org_dists_bullseye-security_InRelease"
132	, "security.debian.org_dists_buster_updates_main_binary-amd64_Packages"	134	, "security.debian.org_dists_bullseye-security_main_binary-amd64_Packages"
133	, "security.debian.org_dists_buster_updates_main_i18n_Translation-en"	135	, "security.debian.org_dists_bullseye-security_main_i18n_Translation-en"
134	]	136	]
135		137
136	buildRoot :: DiskImageConfig -> FilePath -> Action ()	138	buildRoot :: DiskImageConfig -> FilePath -> Action ()