summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2021-03-13 20:10:28 -0500
committerAndrew Cady <d@jerkface.net>2021-03-13 20:10:28 -0500
commit341172339f4eaac45cc0392b66ba795641e326e2 (patch)
tree5562cfecc1f26941ab829327d138e81dba6afc9a
parent4b4de008b197db29496e71bf6d6aee9562928467 (diff)
selfstrap: include sid in written sources.list if sid is included on run system sources.list
-rwxr-xr-xselfstrap21
1 files changed, 14 insertions, 7 deletions
diff --git a/selfstrap b/selfstrap
index e3a0d5c..60ac969 100755
--- a/selfstrap
+++ b/selfstrap
@@ -210,16 +210,23 @@ write_sources_list()
210 [ ! "$REWRITE_SOURCES_LIST" -a -e "$dest" ] && return 210 [ ! "$REWRITE_SOURCES_LIST" -a -e "$dest" ] && return
211 printf 'APT::Default-Release "%s";\n' "$target_release" > "$TARGET"/etc/apt/apt.conf.d/default-release 211 printf 'APT::Default-Release "%s";\n' "$target_release" > "$TARGET"/etc/apt/apt.conf.d/default-release
212 ( 212 (
213 printf '%s\n' \ 213 if [ "$target_release" ]
214 "deb ${debian_mirror} ${target_release} main contrib non-free" \ 214 then
215 "deb ${debian_mirror} ${target_release}-backports main contrib non-free" \ 215 printf '%s\n' \
216 "deb ${debian_security_mirror} ${target_release}/updates main contrib non-free" 216 "deb ${debian_mirror} ${target_release} main contrib non-free" \
217 "deb ${debian_mirror} ${target_release}-backports main contrib non-free" \
218 "deb ${debian_security_mirror} ${target_release}/updates main contrib non-free"
219 fi
220 if apt policy | grep -q ' sid/'
221 then
222 printf '%s\n' \
223 "deb ${debian_mirror} sid main contrib non-free"
217 if [ "$target_release" = stretch ] 224 if [ "$target_release" = stretch ]
218 then 225 then
219 printf '%s\n' \ 226 printf '%s\n' \
220 "deb ${debian_mirror} buster main contrib non-free" \ 227 "deb ${debian_mirror} buster main contrib non-free" \
221 "deb ${debian_mirror} buster-backports main contrib non-free" \ 228 "deb ${debian_mirror} buster-backports main contrib non-free" \
222 "deb ${debian_security_mirror} buster/updates main contrib non-free" 229 "deb ${debian_security_mirror} buster/updates main contrib non-free"
223 230
224 fi 231 fi
225 ) | column -t > "$dest" 232 ) | column -t > "$dest"