From 341172339f4eaac45cc0392b66ba795641e326e2 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sat, 13 Mar 2021 20:10:28 -0500 Subject: selfstrap: include sid in written sources.list if sid is included on run system sources.list --- selfstrap | 21 ++++++++++++++------- 1 file 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() [ ! "$REWRITE_SOURCES_LIST" -a -e "$dest" ] && return printf 'APT::Default-Release "%s";\n' "$target_release" > "$TARGET"/etc/apt/apt.conf.d/default-release ( - 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" + if [ "$target_release" ] + then + 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" + fi + if apt policy | grep -q ' sid/' + then + printf '%s\n' \ + "deb ${debian_mirror} sid main contrib non-free" if [ "$target_release" = stretch ] then printf '%s\n' \ - "deb ${debian_mirror} buster main contrib non-free" \ - "deb ${debian_mirror} buster-backports main contrib non-free" \ - "deb ${debian_security_mirror} buster/updates main contrib non-free" + "deb ${debian_mirror} buster main contrib non-free" \ + "deb ${debian_mirror} buster-backports main contrib non-free" \ + "deb ${debian_security_mirror} buster/updates main contrib non-free" fi ) | column -t > "$dest" -- cgit v1.2.3