From 6717249941344bd1c401fe0c2f5b525d5b43599b Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 14 Mar 2014 16:55:07 -0500
Subject: [PATCH] Revert "chroot: 2nd pass with debootstrap also pass
--components=xyz"
This reverts commit ea75121b9ab120bfc07e260edce2c46f014bfd2d.
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
scripts/chroot.sh | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index de38f3cf2..7edafb4ab 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -161,15 +161,9 @@ if [ "x${host_arch}" != "xarmv7l" ] ; then
sudo cp $(which qemu-arm-static) ${tempdir}/usr/bin/
fi
-unset options
-if [ "${deb_components}" ] ; then
- components=$(echo ${deb_components} | sed 's/ /,/g')
- options="--components=${components}"
-fi
-
-echo "Log: Running: [sudo chroot ${tempdir} debootstrap/debootstrap ${options} --second-stage]"
-sudo chroot ${tempdir} debootstrap/debootstrap ${options} --second-stage
-echo "Log: Complete: [sudo chroot ${tempdir} debootstrap/debootstrap ${options} --second-stage]"
+echo "Log: Running: debootstrap second-stage in [${tempdir}]"
+sudo chroot ${tempdir} debootstrap/debootstrap --second-stage
+echo "Log: Complete: [sudo chroot ${tempdir} debootstrap/debootstrap --second-stage]"
report_size
if [ "x${chroot_very_small_image}" = "xenable" ] ; then
--
GitLab