summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2021-03-13 19:16:00 -0500
committerAndrew Cady <d@jerkface.net>2021-03-13 19:16:48 -0500
commit254b7b898c215908866f7e0db317131a18c9f0a4 (patch)
treec6e8eb63c4cb53b7e7adb8c06bf6c1f13e7394d8
parent0bb6decd18bffddf889f1daa5ed8c7ca9fadabc9 (diff)
selfstrap can be given a target debian release with --release
-rwxr-xr-xselfstrap6
1 files changed, 4 insertions, 2 deletions
diff --git a/selfstrap b/selfstrap
index 57227ae..3f6cf31 100755
--- a/selfstrap
+++ b/selfstrap
@@ -13,6 +13,7 @@ usage()
13 cat <<EOF 13 cat <<EOF
14 Options: 14 Options:
15 --target|-t (Mandatory) Target directory 15 --target|-t (Mandatory) Target directory
16 --release Target Debian release
16 --help|-h 17 --help|-h
17 --verbose|-v 18 --verbose|-v
18 --unpack Only unpack; do not configure 19 --unpack Only unpack; do not configure
@@ -24,7 +25,7 @@ EOF
24 exit ${1:-1} 25 exit ${1:-1}
25} 26}
26 27
27GETOPT=$(getopt -n "${0##*/}" -o t:hv --long help,target:,verbose,unpack,chroot:,packages:,real-apt,skip-update -- "$@") || exit 28GETOPT=$(getopt -n "${0##*/}" -o t:hv --long help,target:,release:,verbose,unpack,chroot:,packages:,real-apt,skip-update -- "$@") || exit
28eval set -- "$GETOPT" 29eval set -- "$GETOPT"
29while [ $# -gt 0 ]; do 30while [ $# -gt 0 ]; do
30 case "$1" in 31 case "$1" in
@@ -36,6 +37,7 @@ while [ $# -gt 0 ]; do
36 --packages) x=$(cat < "$2") || die "could not read file '$2'" 37 --packages) x=$(cat < "$2") || die "could not read file '$2'"
37 EXTRA_PACKAGES="$EXTRA_PACKAGES $x" 38 EXTRA_PACKAGES="$EXTRA_PACKAGES $x"
38 shift ;; 39 shift ;;
40 --release) target_release=$2; shift ;;
39 --chroot) CHROOT_PROG=$2; shift ;; 41 --chroot) CHROOT_PROG=$2; shift ;;
40 --real-apt) REAL_APT_INSTALL=y 42 --real-apt) REAL_APT_INSTALL=y
41 REAL_DPKG=y;; 43 REAL_DPKG=y;;
@@ -446,7 +448,7 @@ apt_get_update()
446set -e 448set -e
447 449
448target_arch=$(dpkg-architecture -q DEB_HOST_ARCH) || die 'dpkg-architecture failed' 450target_arch=$(dpkg-architecture -q DEB_HOST_ARCH) || die 'dpkg-architecture failed'
449target_release=$(current_debian_codename) && [ "$target_release" ] || die 'could not determine Debian release name' 451[ "$target_release" ] || target_release=$(current_debian_codename) && [ "$target_release" ] || die 'could not determine Debian release name'
450 452
451# Set things up so apt-get update works. 453# Set things up so apt-get update works.
452sanity_checks 454sanity_checks