Merging upstream version 20180527.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

23 files changed, 48 insertions, 29 deletions

diff --git a/share/man/container-auto.1.txt b/share/man/container-auto.1.txt
index 43713be..f1ab951 100644
--- a/share/man/container-auto.1.txt
+++ b/share/man/container-auto.1.txt
@@ -83,4 +83,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-console.1.txt b/share/man/container-console.1.txt
index f327097..4ea8216 100644
--- a/share/man/container-console.1.txt
+++ b/share/man/container-console.1.txt
@@ -38,6 +38,9 @@ DESCRIPTION
 -----------
 The container console command attaches a console to a container.
 
+While 'container enter' bypasses the login prompt and drops to a root shell,
+the 'container console' command shows a full login prompt where any valid user and password combination can be used.
+
 
 OPTIONS
 -------
@@ -74,4 +77,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-curl.1.txt b/share/man/container-create-curl.1.txt
index 543a261..6486c9b 100644
--- a/share/man/container-create-curl.1.txt
+++ b/share/man/container-create-curl.1.txt
@@ -127,4 +127,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt
index db4028b..a86d964 100644
--- a/share/man/container-create-debconf.1.txt
+++ b/share/man/container-create-debconf.1.txt
@@ -153,4 +153,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt
index 56d6f65..da578bd 100644
--- a/share/man/container-create-debootstrap.1.txt
+++ b/share/man/container-create-debootstrap.1.txt
@@ -95,4 +95,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt
index d21bd58..4e88175 100644
--- a/share/man/container-create.1.txt
+++ b/share/man/container-create.1.txt
@@ -120,4 +120,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-enter.1.txt b/share/man/container-enter.1.txt
index d200295..5051d74 100644
--- a/share/man/container-enter.1.txt
+++ b/share/man/container-enter.1.txt
@@ -38,6 +38,9 @@ DESCRIPTION
 -----------
 The container enter enters a container namespace.
 
+While 'container console' shows a full login prompt where any valid user and password combination can be used,
+the 'container enter' command bypasses this and drops to a root shell.
+
 
 OPTIONS
 -------
@@ -74,4 +77,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-key.1.txt b/share/man/container-key.1.txt
index 0cd26b2..448bd56 100644
--- a/share/man/container-key.1.txt
+++ b/share/man/container-key.1.txt
@@ -84,4 +84,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-limit.1.txt b/share/man/container-limit.1.txt
index 7af59e7..a36328a 100644
--- a/share/man/container-limit.1.txt
+++ b/share/man/container-limit.1.txt
@@ -107,4 +107,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt
index 10f9ac3..8a018b0 100644
--- a/share/man/container-list.1.txt
+++ b/share/man/container-list.1.txt
@@ -124,4 +124,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-move.1.txt b/share/man/container-move.1.txt
index 2f90433..172bd67 100644
--- a/share/man/container-move.1.txt
+++ b/share/man/container-move.1.txt
@@ -85,4 +85,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt
index ab807f4..94d167b 100644
--- a/share/man/container-remove.1.txt
+++ b/share/man/container-remove.1.txt
@@ -46,7 +46,7 @@ OPTIONS
 The following container options are available:
 
 *-n, --name='NAME'*::
-	Specify container name.
+	Specify container name. Specifying 'ALL' will remove all stopped container.
 
 *--allow-stop*::
 	Stop container prior removal.
@@ -69,6 +69,9 @@ EXAMPLES
 *Remove a running container from the system, without prompt:*::
 	sudo container remove -n example.net -f --allow-stop
 
+*Remove all container:*::
+	sudo container remove -n ALL
+
 
 SEE ALSO
 --------
@@ -91,4 +94,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-restart.1.txt b/share/man/container-restart.1.txt
index 922bbe4..99b461d 100644
--- a/share/man/container-restart.1.txt
+++ b/share/man/container-restart.1.txt
@@ -44,7 +44,7 @@ OPTIONS
 The following container options are available:
 
 *-n, --name='NAME'*::
-	Specify container name.
+	Specify container name. Specifying 'ALL' will restart all started container.
 
 
 EXAMPLES
@@ -52,6 +52,9 @@ EXAMPLES
 *Restart example.net container:*::
 	sudo container restart -n example.net
 
+*Restart all container:*::
+	sudo container restart -n ALL
+
 
 SEE ALSO
 --------
@@ -74,4 +77,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt
index d36c93d..bd0f4e1 100644
--- a/share/man/container-shell.1.txt
+++ b/share/man/container-shell.1.txt
@@ -110,4 +110,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-start.1.txt b/share/man/container-start.1.txt
index 8aa7d28..ae4ff89 100644
--- a/share/man/container-start.1.txt
+++ b/share/man/container-start.1.txt
@@ -44,7 +44,7 @@ OPTIONS
 The following container options are available:
 
 *-n, --name='NAME'*::
-	Specify container name.
+	Specify container name. Specifying 'ALL' will start all stopped container.
 
 *-f, --force'*::
 	Removing stray lock file if existing.
@@ -55,6 +55,9 @@ EXAMPLES
 *Start example.net container:*::
 	sudo container start -n example.net
 
+*Start all container:*::
+	sudo container start -n ALL
+
 
 SEE ALSO
 --------
@@ -77,4 +80,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-status.1.txt b/share/man/container-status.1.txt
index 2cfd28d..b403769 100644
--- a/share/man/container-status.1.txt
+++ b/share/man/container-status.1.txt
@@ -74,4 +74,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt
index 22589be..ec169d8 100644
--- a/share/man/container-stop.1.txt
+++ b/share/man/container-stop.1.txt
@@ -44,7 +44,7 @@ OPTIONS
 The following container options are available:
 
 *-n, --name='NAME'*::
-	Specify container name.
+	Specify container name. Specifying 'ALL' will stop all started container.
 
 *-f, --force*::
 	Instead of running the proper shutdown sequence, terminate all processes of the container imediatly.
@@ -58,6 +58,9 @@ EXAMPLES
 *Immediately stop example.net container:*::
 	sudo container stop -n example.net -f
 
+*Stop all container:*::
+	sudo container stop -n ALL
+
 
 SEE ALSO
 --------
@@ -80,4 +83,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt
index 1d17dec..8195ea4 100644
--- a/share/man/container-tools.7.txt
+++ b/share/man/container-tools.7.txt
@@ -131,4 +131,4 @@ LINKS
 
 AUTHORS
 -------
-  * Daniel Baumann <daniel.baumann@open-infrastructure.net>
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-top.1.txt b/share/man/container-top.1.txt
index 93e83e8..2f99c5b 100644
--- a/share/man/container-top.1.txt
+++ b/share/man/container-top.1.txt
@@ -74,4 +74,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-version.1.txt b/share/man/container-version.1.txt
index 170e3c4..19a1138 100644
--- a/share/man/container-version.1.txt
+++ b/share/man/container-version.1.txt
@@ -73,4 +73,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
index 5161154..5cc83f2 100644
--- a/share/man/container.1.txt
+++ b/share/man/container.1.txt
@@ -145,4 +145,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net>.
+container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/procps/zz-container-tools.conf b/share/procps/zz-container-tools.conf
index 2396dfc..8b15f11 100644
--- a/share/procps/zz-container-tools.conf
+++ b/share/procps/zz-container-tools.conf
@@ -1,6 +1,7 @@
-# The default limits are set to small and eventually lead to errors like
-# the following on container start:
-# Failed to allocate directory watch: Too many open files
+# The default limits are set to low for running many containers
+# and eventually lead to errors like the following on container start:
+#
+#   Failed to allocate directory watch: Too many open files
 
 # /proc/sys/fs/inotify/max_queued_events defaults to 16384
 fs.inotify.max_queued_events=1048576
diff --git a/share/systemd/container-auto.service b/share/systemd/container-auto.service
index b3384df..99decf6 100644
--- a/share/systemd/container-auto.service
+++ b/share/systemd/container-auto.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=container-tools automatic start
+Description=container-tools automatic start and stop
 Documentation=man:container-auto
 After=network.target