diff options
-rw-r--r-- | fsmgr.hs | 24 | ||||
-rwxr-xr-x | selfstrap | 2 |
2 files changed, 14 insertions, 12 deletions
@@ -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 () |
@@ -216,7 +216,7 @@ write_sources_list() | |||
216 | printf '%s\n' \ | 216 | printf '%s\n' \ |
217 | "deb ${debian_mirror} ${target_release} main contrib non-free" \ | 217 | "deb ${debian_mirror} ${target_release} main contrib non-free" \ |
218 | "deb ${debian_mirror} ${target_release}-backports main contrib non-free" \ | 218 | "deb ${debian_mirror} ${target_release}-backports main contrib non-free" \ |
219 | "deb ${debian_security_mirror} ${target_release}/updates main contrib non-free" | 219 | "deb ${debian_security_mirror} ${target_release}$_updates main contrib non-free" |
220 | fi | 220 | fi |
221 | if apt policy | grep -q ' sid/' | 221 | if apt policy | grep -q ' sid/' |
222 | then | 222 | then |