From bb47d2cd28aff26a054d3c10d4131dbe3ad476c6 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Wed, 19 Jun 2019 11:45:30 -0400
Subject: selfstrap

---
 src/selfstrap | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/selfstrap b/src/selfstrap
index f379525..7f331e9 100755
--- a/src/selfstrap
+++ b/src/selfstrap
@@ -1,5 +1,6 @@
 #!/bin/bash
 debian_mirror=http://httpredir.debian.org/debian
+debian_security_mirror=http://security.debian.org
 EXTRA_PACKAGES='apt debian-archive-keyring locales'
 
 die() { printf 'Error: %s\n' "$*"; exit 1; }
@@ -187,13 +188,21 @@ populate_rootfs()
     [ -e "$TARGET/usr/bin/awk" -o -L "$TARGET/usr/bin/awk" ] || ln -s mawk "$TARGET/usr/bin/awk"
 
     write_lines_once "$TARGET"/var/lib/dpkg/arch "$target_arch"
-    write_lines_once "$TARGET"/etc/apt/sources.list \
-                     "deb $debian_mirror $target_release main contrib non-free" \
-                     "deb http://httpredir.debian.org/debian ${target_release}-backports main contrib non-free" \
-                     "deb http://security.debian.org $target_release/updates main contrib non-free"
+    write_sources_list
     install_devices
 }
 
+write_sources_list()
+{
+    local dest="$TARGET"/etc/apt/sources.list
+    [ -e "$dest" ] && return
+    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"  |
+        column -t > "$dest"
+}
+
 parse_apt_simul_line()
 {
     set -- $*
-- 
cgit v1.2.3