diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-10-02 21:08:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-10-02 21:08:44 +0000 |
commit | 358993337bb49b29f4d0ec097d612525957560ec (patch) | |
tree | 84ca1b315ca941e585c3c1d2e331fdc7e99d5d14 /share | |
parent | Releasing debian version 20220721-2. (diff) | |
download | open-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 '')
-rwxr-xr-x | share/build-scripts/debconf | 3 | ||||
-rwxr-xr-x | share/build-scripts/debootstrap | 2 | ||||
-rw-r--r-- | share/man/container-restart.1.rst | 6 |
3 files changed, 9 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 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. |