From 358993337bb49b29f4d0ec097d612525957560ec Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 2 Oct 2022 23:08:44 +0200 Subject: Merging upstream version 20221002. Signed-off-by: Daniel Baumann --- share/build-scripts/debconf | 3 ++- share/build-scripts/debootstrap | 2 +- share/man/container-restart.1.rst | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'share') 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 diff --git a/share/man/container-restart.1.rst b/share/man/container-restart.1.rst index bb2d4f1..c52353d 100644 --- a/share/man/container-restart.1.rst +++ b/share/man/container-restart.1.rst @@ -47,6 +47,12 @@ The following **container restart** options are available: -n, --name='NAME': Specify container name. Specifying 'ALL' will restart all started container. +-f, --force: + Do not prompt before every restarting. + +-i, --interactive: + Prompt before every restarting (default). + -v, --verbose: Explain what is being done. -- cgit v1.2.3