From 07357f5916ea7380a6008b6e29d50c1889311491 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 25 Oct 2016 15:13:01 +0200 Subject: Merging upstream version 20161101. Signed-off-by: Daniel Baumann --- share/man/container-create-debconf.1.txt | 2 +- share/man/container-create-debootstrap.1.txt | 12 +-- share/man/container-enter.1.txt | 72 ------------------ share/man/container-limit.1.txt | 105 --------------------------- share/man/container-stop.1.txt | 6 -- share/man/container-tools.7.txt | 4 +- share/man/container.1.txt | 6 -- 7 files changed, 10 insertions(+), 197 deletions(-) delete mode 100644 share/man/container-enter.1.txt delete mode 100644 share/man/container-limit.1.txt (limited to 'share/man') diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt index 76f86cc..9593415 100644 --- a/share/man/container-create-debconf.1.txt +++ b/share/man/container-create-debconf.1.txt @@ -101,7 +101,7 @@ The following script options are available: EXAMPLES -------- *Create a Debian based container:*:: - sudo container create -s debian -n jessie.example.net + sudo container create -s debian -n stretch.example.net *Create a Progress Linux container:*:: sudo container create -s progress-linux -n cairon-backports.example.net diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt index 3377ea0..7f7d8fb 100644 --- a/share/man/container-create-debootstrap.1.txt +++ b/share/man/container-create-debootstrap.1.txt @@ -54,10 +54,10 @@ The following script options are available: Specify the Debian architecture, defaults to the host systems architecture. *-d, --distribution='DISTRIBUTION'*:: - Specify the Debian distribution, defaults to jessie. + Specify the Debian distribution, defaults to stretch. *-m, --mirror='MIRROR'*:: - Specify the Debian mirror, defaults to http://ftp.debian.org/debian. + Specify the Debian mirror, defaults to https://deb.debian.org/debian. *-p, --root-password='PASSWORD'*:: Specify the root password, defaults to a random 16 character password. @@ -65,11 +65,11 @@ The following script options are available: EXAMPLES -------- -*Create a Debian 8 (jessie) based container with same architecture as the host system:*:: - sudo container create -s debootstrap -n jessie.example.net +*Create a Debian 9 (stretch) based container with same architecture as the host system:*:: + sudo container create -s debootstrap -n stretch.example.net -*Create a Debian 8 (jessie) based container with different architecture as the host system:*:: - sudo container create -s debootstrap -n jessie-i386.example.net -- -a i386 +*Create a Debian 9 (stretch) based container with different architecture as the host system:*:: + sudo container create -s debootstrap -n stretch-i386.example.net -- -a i386 SEE ALSO diff --git a/share/man/container-enter.1.txt b/share/man/container-enter.1.txt deleted file mode 100644 index 61c0f66..0000000 --- a/share/man/container-enter.1.txt +++ /dev/null @@ -1,72 +0,0 @@ -// container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2016 Daniel Baumann -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -CONTAINER-CONSOLE(1) -==================== -:doctype: manpage -:man manual: Open Infrastructure -:man source: container-tools -:man version: {revnumber} - - -NAME ----- -container-enter - Enter a container namespace - - -SYNOPSIS --------- -*container enter* ['OPTIONS'] - - -DESCRIPTION ------------ -The container enter enters a container namespace. - - -OPTIONS -------- -The following container options are available: - -*-n, --name='NAME'*:: - Specify container name. - - -EXAMPLES --------- -*Enter to example.net container namespace:*:: - sudo container enter -n example.net - - -SEE ALSO --------- -container-tools(7), -container(1). - - -HOMEPAGE --------- -More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net. - - -BUGS ----- -Bugs can be reported by sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org. - - -AUTHORS -------- -container-tools was written by Daniel Baumann . diff --git a/share/man/container-limit.1.txt b/share/man/container-limit.1.txt deleted file mode 100644 index 0ba5b74..0000000 --- a/share/man/container-limit.1.txt +++ /dev/null @@ -1,105 +0,0 @@ -// container-tools - Manage systemd-nspawn containers -// Copyright (C) 2014-2016 Daniel Baumann -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . - -CONTAINER-LIMIT(1) -================== -:doctype: manpage -:man manual: Open Infrastructure -:man source: container-tools -:man version: {revnumber} - - -NAME ----- -container-limit - Limit ressources of a container - - -SYNOPSIS --------- -*container limit* ['OPTIONS'] - - -DESCRIPTION ------------ -The container limit command limits ressources available to a container at runtime. - - -OPTIONS -------- -The following container options are available: - -*-n, --name='NAME'*:: - Specify container name. - -*--blockio-device-weight='DEVICE WEIGHT'*:: - Specify device specific blockio weight, see systemd.resource-control(5). - -*--blockio-read-bandwith='DEVICE BYTES'*:: - Specify device specific blockio read bandwith, see systemd.resource-control(5). - -*-b, --blockio-weight='WEIGHT'*:: - Specify general blockio weight, see systemd.resource-control(5). - -*--blockio-write-bandwith='DEVICE BYTES'*:: - Specify device specific blockio write bandwith, see systemd.resource-control(5). - -*-c, --cpu-quota='QUOTA'*:: - Specify CPU quota, see systemd.resource-control(5). - -*--cpu-shares='SHARES'*:: - Specify CPU shares, see systemd.resource-control(5). - -*-m, --memory-limit='BYTES'*:: - Specify memory limit, see systemd.resource-control(5). - -*-t, --tasks-max='NUMBER'*:: - Specify tasks max, see systemd.resource-control(5). - - -EXAMPLES --------- -*Set blockio weight for the example.net container:*:: - sudo container limit -n example.net --blockio-weight 100 - -*Set CPU quota for the example.net container:*:: - sudo container limit -n example.net --cpu-quota 10% - -*Set memory limit for the example.net container to 1GB:*:: - sudo container limit -n example.net --memory-limit 1G - -*Set tasks max for the example.net container to 100:*:: - sudo container limit -n example.net --tasks-max 100 - - -SEE ALSO --------- -container-tools(7), -container(1). - - -HOMEPAGE --------- -More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net. - - -BUGS ----- -Bugs can be reported by sending a bug report to the Debian Bug Tracking System at https://bugs.debian.org. - - -AUTHORS -------- -container-tools was written by Daniel Baumann . diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt index 7531f1c..8b864d6 100644 --- a/share/man/container-stop.1.txt +++ b/share/man/container-stop.1.txt @@ -44,18 +44,12 @@ The following container options are available: *-n, --name='NAME'*:: Specify container name. -*-f, --force*:: - Instead of running the proper shutdown sequence, terminate all processes of the container imediatly. - EXAMPLES -------- *Shutdown example.net container:*:: sudo container stop -n example.net -*Immediately stop example.net container:*:: - sudo container stop -n example.net -f - SEE ALSO -------- diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt index 604683f..2e71b05 100644 --- a/share/man/container-tools.7.txt +++ b/share/man/container-tools.7.txt @@ -75,7 +75,9 @@ Please base them against the 'next' Git branch using common sense: KNOWN LIMITATIONS ----------------- -container-tools currently do not work with systemd-networkd and depend on ifupdown. + * This version of container-tools currently do not work with systemd-networkd and depend on ifupdown. + * Using overlay, the upper directory can not be an NFS mount due to limitations in Linux' overlay filesystem, + see https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/filesystems/overlayfs.txt USAGE diff --git a/share/man/container.1.txt b/share/man/container.1.txt index 32bd393..78a7d68 100644 --- a/share/man/container.1.txt +++ b/share/man/container.1.txt @@ -67,12 +67,6 @@ The following container commands are available: *console*:: Attach console to a container, see container-console(1). -*enter*:: - Enter a container namespace, see container-enter(1). - -*limit*:: - Limit ressources of a container, see container-limit(1). - *list*:: List container on the system, see container-list(1). -- cgit v1.2.3