summaryrefslogtreecommitdiffstats
path: root/share/build-scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-10-02 21:08:44 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-10-02 21:08:44 +0000
commit358993337bb49b29f4d0ec097d612525957560ec (patch)
tree84ca1b315ca941e585c3c1d2e331fdc7e99d5d14 /share/build-scripts
parentReleasing debian version 20220721-2. (diff)
downloadopen-infrastructure-compute-tools-358993337bb49b29f4d0ec097d612525957560ec.tar.xz
open-infrastructure-compute-tools-358993337bb49b29f4d0ec097d612525957560ec.zip
Merging upstream version 20221002.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/build-scripts')
-rwxr-xr-xshare/build-scripts/debconf3
-rwxr-xr-xshare/build-scripts/debootstrap2
2 files changed, 3 insertions, 2 deletions
diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf
index ac5f9cd..b589fce 100755
--- a/share/build-scripts/debconf
+++ b/share/build-scripts/debconf
@@ -405,7 +405,8 @@ Debootstrap ()
mmdebstrap)
mmdebstrap --arch=${ARCHITECTURE} --components=${PARENT_ARCHIVE_AREAS} \
- --mode=root --include=${INCLUDE} ${PARENT_DISTRIBUTION} "${DIRECTORY}" ${PARENT_MIRROR}
+ --format=directory --mode=root --aptopt='APT::Sandbox::User "root"' \
+ --include=${INCLUDE} ${PARENT_DISTRIBUTION} "${DIRECTORY}" ${PARENT_MIRROR}
;;
*)
diff --git a/share/build-scripts/debootstrap b/share/build-scripts/debootstrap
index 2cfa328..567ee6b 100755
--- a/share/build-scripts/debootstrap
+++ b/share/build-scripts/debootstrap
@@ -136,7 +136,7 @@ case "${SCRIPT}" in
mmdebstrap)
BOOTSTRAP="/usr/bin/mmdebstrap"
- BOOTSTRAP_OPTIONS="--mode=root"
+ BOOTSTRAP_OPTIONS="--format=directory --mode=root --aptopt='APT::Sandbox::User \"root\"'"
;;
esac