selfstrap: include backports in sources.list

1 files changed, 18 insertions, 22 deletions

diff --git a/src/selfstrap b/src/selfstrap
index 86bbab4..f379525 100755
--- a/src/selfstrap
+++ b/src/selfstrap
@@ -68,9 +68,7 @@ generate_apt_config()
     APT_CONFIG=$(mktemp) || exit
     chmod 644 "$APT_CONFIG"
     cat > "$APT_CONFIG" <<EOF
-Dir::Etc "${TARGET}/etc/apt/";
-Dir::Etc::Parts "${TARGET}/etc/apt/apt.conf.d/";
-Dir::Etc::PreferencesParts "${TARGET}/etc/apt/preferences.d/";
+Dir "${TARGET}";
 EOF
     export APT_CONFIG
 }
@@ -87,37 +85,34 @@ apt_()
         printf "+ apt-${apt_cmd} %s\n" "$*" >&2
     fi
 
-    set  --  -o  Apt::Install-Recommends=false                                "$@"
+    set -- "$@" -o Apt::Install-Recommends=false
+    set -- "$@" -o Apt::Architecture="$target_arch"
+    set -- "$@" -o Apt::Default-Release="$target_release"
 
-    # Set various paths to within the created system.
-    set  --  -o  Apt::Architecture="$target_arch"                             "$@"
-    set  --  -o  Apt::Default-Release="$target_release"                       "$@"
-    set  --  -o  Dir="$TARGET"                                                "$@"
-    set  --  -o  Dir::Cache="$TARGET"/var/cache/apt/                          "$@"
-    set  --  -o  Dir::Etc::Parts="$TARGET"/etc/apt/apt.conf.d/                "$@"
-    set  --  -o  Dir::Etc::PreferencesParts="$TARGET"/etc/apt/preferences.d/  "$@"
-    set  --  -o  Dir::Etc="$TARGET"/etc/apt/                                  "$@"
-    set  --  -o  Dir::State="$TARGET"/var/lib/apt/                            "$@"
-    set  --  -o  Dir::State::Status="$TARGET"/var/lib/dpkg/status             "$@"
+    # Set default paths to within the created system.
+    set -- "$@" -o Dir="$TARGET"
+    set -- "$@" -o Dir::State::Status="$TARGET"/var/lib/dpkg/status
 
     # We must also set dpkg to use the created system.
     # Dpkg::options requires undocumented apt CLI magic.
     if [ "$DEBUG_DPKG" ]; then
         [ "$DEBUG_DPKG" -gt 0 ] 2>/dev/null || DEBUG_DPKG=10013
-        set  --  -o  DPkg::options::arg0=--debug="${DEBUG_DPKG}"              "$@"
+        set -- "$@" -o DPkg::options::arg0=--debug="${DEBUG_DPKG}"
     fi
     # This is the important one:
-    set  --  -o  DPkg::options::arg1=--root="$TARGET"                         "$@"
-    set  --  -o  DPkg::options::arg2=--force-unsafe-io                        "$@"
+    set -- "$@" -o DPkg::options::arg1=--root="$TARGET"
+    set -- "$@" -o DPkg::options::arg2=--force-unsafe-io
 
     # Use the calling system for these.  This is an optimization.
-    set  --  -o  Dir::Cache::archives=/var/cache/apt/archives                 "$@"
-    set  --  -o  Dir::Etc::Trusted=/etc/apt/trusted.gpg                       "$@"
-    set  --  -o  Dir::Etc::TrustedParts=/etc/apt/trusted.gpg.d                "$@"
-    set  --  -o  Dir::State::Lists=/var/lib/apt/lists                         "$@"
+    #set -- "$@" -o Dir::Etc::sourcelist=/etc/apt/sources.list
+    #set -- "$@" -o Dir::Etc::sourceparts=/etc/apt/sources.list.d
+    set -- "$@" -o Dir::Etc::Trusted=/etc/apt/trusted.gpg
+    set -- "$@" -o Dir::Etc::TrustedParts=/etc/apt/trusted.gpg.d
+    set -- "$@" -o Dir::State::lists=/var/lib/apt/lists
+    set -- "$@" -o Dir::Cache::archives=/var/cache/apt/archives
 
     # Avoid deleting lists on the calling system.
-    set  --  -o  APT::Get::List-Cleanup=false                                 "$@"
+    set  -- "$@" -o  APT::Get::List-Cleanup=false
 
     apt-"${apt_cmd}" "$@"
 }
@@ -194,6 +189,7 @@ populate_rootfs()
     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"
     install_devices
 }