From 6dfbd8d9b0b55ebe052f91ae5823d8108799983a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 18 Feb 2018 16:12:38 +0100 Subject: Merging upstream version 20180218. Signed-off-by: Daniel Baumann --- share/man/Makefile | 2 +- share/man/container-auto.1.txt | 2 +- share/man/container-console.1.txt | 2 +- share/man/container-create-curl.1.txt | 2 +- share/man/container-create-debconf.1.txt | 2 +- share/man/container-create-debootstrap.1.txt | 2 +- share/man/container-create.1.txt | 2 +- share/man/container-enter.1.txt | 2 +- share/man/container-key.1.txt | 2 +- share/man/container-limit.1.txt | 2 +- share/man/container-list.1.txt | 2 +- share/man/container-move.1.txt | 2 +- share/man/container-remove.1.txt | 8 +++++++- share/man/container-restart.1.txt | 2 +- share/man/container-shell.1.txt | 2 +- share/man/container-start.1.txt | 2 +- share/man/container-stop.1.txt | 2 +- share/man/container-tools.7.txt | 2 +- share/man/container-top.1.txt | 2 +- share/man/container-version.1.txt | 2 +- share/man/container.1.txt | 2 +- 21 files changed, 27 insertions(+), 21 deletions(-) (limited to 'share/man') diff --git a/share/man/Makefile b/share/man/Makefile index 2f482be..a069734 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -1,7 +1,7 @@ # Makefile # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2017 Daniel Baumann +# Copyright (C) 2014-2018 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/share/man/container-auto.1.txt b/share/man/container-auto.1.txt index 79603dd..43713be 100644 --- a/share/man/container-auto.1.txt +++ b/share/man/container-auto.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-console.1.txt b/share/man/container-console.1.txt index 390c3a6..f327097 100644 --- a/share/man/container-console.1.txt +++ b/share/man/container-console.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-create-curl.1.txt b/share/man/container-create-curl.1.txt index 7ec8ca2..543a261 100644 --- a/share/man/container-create-curl.1.txt +++ b/share/man/container-create-curl.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt index b487adc..ce77c53 100644 --- a/share/man/container-create-debconf.1.txt +++ b/share/man/container-create-debconf.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt index 5241dda..56d6f65 100644 --- a/share/man/container-create-debootstrap.1.txt +++ b/share/man/container-create-debootstrap.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt index 2f41b58..6ffc867 100644 --- a/share/man/container-create.1.txt +++ b/share/man/container-create.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-enter.1.txt b/share/man/container-enter.1.txt index 703628a..d200295 100644 --- a/share/man/container-enter.1.txt +++ b/share/man/container-enter.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-key.1.txt b/share/man/container-key.1.txt index df9605f..0cd26b2 100644 --- a/share/man/container-key.1.txt +++ b/share/man/container-key.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-limit.1.txt b/share/man/container-limit.1.txt index 9a2c532..7af59e7 100644 --- a/share/man/container-limit.1.txt +++ b/share/man/container-limit.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt index 48beae6..10f9ac3 100644 --- a/share/man/container-list.1.txt +++ b/share/man/container-list.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-move.1.txt b/share/man/container-move.1.txt index 126b3c1..2f90433 100644 --- a/share/man/container-move.1.txt +++ b/share/man/container-move.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt index 8dd6fdc..ab807f4 100644 --- a/share/man/container-remove.1.txt +++ b/share/man/container-remove.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // @@ -48,6 +48,9 @@ The following container options are available: *-n, --name='NAME'*:: Specify container name. +*--allow-stop*:: + Stop container prior removal. + *-f, --force*:: Do not prompt before removal. @@ -63,6 +66,9 @@ EXAMPLES *Remove example.net container from the system without prompt:*:: sudo container remove -n example.net -f +*Remove a running container from the system, without prompt:*:: + sudo container remove -n example.net -f --allow-stop + SEE ALSO -------- diff --git a/share/man/container-restart.1.txt b/share/man/container-restart.1.txt index 0239691..922bbe4 100644 --- a/share/man/container-restart.1.txt +++ b/share/man/container-restart.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt index 02705f3..d36c93d 100644 --- a/share/man/container-shell.1.txt +++ b/share/man/container-shell.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-start.1.txt b/share/man/container-start.1.txt index 88ee984..8aa7d28 100644 --- a/share/man/container-start.1.txt +++ b/share/man/container-start.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt index 85eb46b..22589be 100644 --- a/share/man/container-stop.1.txt +++ b/share/man/container-stop.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt index 5e7a53b..1d17dec 100644 --- a/share/man/container-tools.7.txt +++ b/share/man/container-tools.7.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-top.1.txt b/share/man/container-top.1.txt index 4012ccb..93e83e8 100644 --- a/share/man/container-top.1.txt +++ b/share/man/container-top.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-version.1.txt b/share/man/container-version.1.txt index e1e4d2d..170e3c4 100644 --- a/share/man/container-version.1.txt +++ b/share/man/container-version.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container.1.txt b/share/man/container.1.txt index 5029d25..5161154 100644 --- a/share/man/container.1.txt +++ b/share/man/container.1.txt @@ -1,5 +1,5 @@ // container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2017 Daniel Baumann +// Copyright (C) 2014-2018 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // -- cgit v1.2.3