From 915feb5756fe96b0c2c557eeb90ee21cbda8c1e6 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 12 Jul 2018 11:25:11 -0500
Subject: [PATCH] debootstrap: 1.0.105
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
scripts/debootstrap.sh | 5 +++--
scripts/install_dependencies.sh | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/debootstrap.sh b/scripts/debootstrap.sh
index a4b0cbd6e..33b82edf0 100755
--- a/scripts/debootstrap.sh
+++ b/scripts/debootstrap.sh
@@ -127,7 +127,8 @@ if [ "${apt_proxy}" ] ; then
fi
echo "Log: Running: debootstrap in [${tempdir}]"
-echo "Log: [sudo debootstrap ${options} ${suite} ${target} ${mirror}]"
-sudo debootstrap ${options} ${suite} "${target}" ${mirror}
+###FIXME: --no-merged-usr eventually we will support, but as of 1.0.101+ it's back, so default to pre...
+echo "Log: [sudo debootstrap --no-merged-usr ${options} ${suite} ${target} ${mirror}]"
+sudo debootstrap --no-merged-usr ${options} ${suite} "${target}" ${mirror}
report_size
#
diff --git a/scripts/install_dependencies.sh b/scripts/install_dependencies.sh
index fcb01daa5..e75bf3640 100755
--- a/scripts/install_dependencies.sh
+++ b/scripts/install_dependencies.sh
@@ -22,7 +22,7 @@
#http://ftp.us.debian.org/debian/pool/main/d/debootstrap/
#1.0.${minimal_debootstrap}
-minimal_debootstrap="101"
+minimal_debootstrap="105"
host_arch="$(uname -m)"
debootstrap_is_installed () {
--
GitLab