From 87e067ca938dd0ed23e45b55d60c0fd859d037c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 21 Apr 2016 19:48:29 +0200 Subject: Merging upstream version 20160415. Signed-off-by: Daniel Baumann --- share/doc/examples/cairon-backports.cfg | 2 +- share/doc/examples/jessie.cfg | 2 +- share/man/container-shell.1.txt | 14 +++++++++++++- share/man/container-stop.1.txt | 4 ++-- share/man/container-tools.7.txt | 2 +- share/scripts/debconf.d/0003-debconf | 8 ++++---- share/scripts/debian | 1 - share/scripts/debian.d | 1 - share/scripts/progress-linux | 1 - share/scripts/progress-linux.d | 1 - share/systemd/container-autostart.service | 2 +- 11 files changed, 23 insertions(+), 15 deletions(-) delete mode 120000 share/scripts/debian delete mode 120000 share/scripts/debian.d delete mode 120000 share/scripts/progress-linux delete mode 120000 share/scripts/progress-linux.d (limited to 'share') diff --git a/share/doc/examples/cairon-backports.cfg b/share/doc/examples/cairon-backports.cfg index 096cc5e..2fca922 100644 --- a/share/doc/examples/cairon-backports.cfg +++ b/share/doc/examples/cairon-backports.cfg @@ -17,7 +17,7 @@ container-tools cnt-debconf/archives multiselect cairon-security, cairon-updates container-tools cnt-debconf/mirror string http://cdn.archive.progress-linux.org/packages container-tools cnt-debconf/mirror-security string http://cdn.archive.progress-linux.org/packages -container-tools cnt-debconf/parent-mirror string http://httpredir.debian.org/debian +container-tools cnt-debconf/parent-mirror string http://ftp.debian.org/debian container-tools cnt-debconf/parent-mirror-security string http://security.debian.org container-tools cnt-debconf/archive-areas multiselect main, contrib, non-free diff --git a/share/doc/examples/jessie.cfg b/share/doc/examples/jessie.cfg index 509b09e..e9f9d46 100644 --- a/share/doc/examples/jessie.cfg +++ b/share/doc/examples/jessie.cfg @@ -14,7 +14,7 @@ container-tools cnt-debconf/architecture select auto container-tools cnt-debconf/archives multiselect jessie-security, jessie-updates #container-tools cnt-debconf/parent-archives multiselect -container-tools cnt-debconf/mirror string http://httpredir.debian.org/debian +container-tools cnt-debconf/mirror string http://ftp.debian.org/debian container-tools cnt-debconf/mirror-security string http://security.debian.org #container-tools cnt-debconf/parent-mirror string diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt index 946f77e..9a2fdd8 100644 --- a/share/man/container-shell.1.txt +++ b/share/man/container-shell.1.txt @@ -39,7 +39,19 @@ container-tools provides the system integration for managing containers using sy COMMANDS -------- -All container commands are available, see container(1). +All container commands are available, see container(1). Additionally, the following commands are specific to container-shell: + +*about:*:: + shows introduction (manpage). + +*help:*:: + shows available commands within the container-shell. + +*help COMMAND:*:: + shows help (manpage) for a specific container command. + +*logout:*:: + exits container-shell. SEE ALSO diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt index 8f368cf..5f8356d 100644 --- a/share/man/container-stop.1.txt +++ b/share/man/container-stop.1.txt @@ -44,7 +44,7 @@ The following container options are available: *-n, --name='NAME'*:: Specify container name. -*-k, --kill*:: +*-f, --force*:: Instead of running the proper shutdown sequence, terminate all processes of the container imediatly. @@ -54,7 +54,7 @@ EXAMPLES sudo container stop -n example.net *Immediately stop example.net container:*:: - sudo container stop -n example.net -k + 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 dc35030..d8e5ac9 100644 --- a/share/man/container-tools.7.txt +++ b/share/man/container-tools.7.txt @@ -54,7 +54,7 @@ SOURCE DEBIAN 8 (STRETCH) AND NEWER ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * sudo apt install open-infrastructure-container-tools + * sudo apt install container-tools DEVELOPMENT diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf index 2d0e3a9..03db192 100755 --- a/share/scripts/debconf.d/0003-debconf +++ b/share/scripts/debconf.d/0003-debconf @@ -298,7 +298,7 @@ Mirror () then case "${MODE}" in debian) - db_set cnt-debconf/mirror http://httpredir.debian.org/debian + db_set cnt-debconf/mirror http://ftp.debian.org/debian db_fset cnt-debconf/mirror seen false ;; @@ -319,7 +319,7 @@ Mirror () then case "${MODE}" in debian) - MIRROR="http://httpredir.debian.org/debian" + MIRROR="http://ftp.debian.org/debian" ;; progress-linux) @@ -391,7 +391,7 @@ Parent_mirror () then case "${MODE}" in progress-linux) - db_set cnt-debconf/parent-mirror http://httpredir.debian.org/debian + db_set cnt-debconf/parent-mirror http://ftp.debian.org/debian db_fset cnt-debconf/parent-mirror seen false db_settitle cnt-debconf/title @@ -412,7 +412,7 @@ Parent_mirror () then case "${MODE}" in progress-linux) - PARENT_MIRROR="http://httpredir.debian.org/debian" + PARENT_MIRROR="http://ftp.debian.org/debian" ;; *) diff --git a/share/scripts/debian b/share/scripts/debian deleted file mode 120000 index 7f725c5..0000000 --- a/share/scripts/debian +++ /dev/null @@ -1 +0,0 @@ -debconf \ No newline at end of file diff --git a/share/scripts/debian.d b/share/scripts/debian.d deleted file mode 120000 index 4ce36fe..0000000 --- a/share/scripts/debian.d +++ /dev/null @@ -1 +0,0 @@ -debconf.d \ No newline at end of file diff --git a/share/scripts/progress-linux b/share/scripts/progress-linux deleted file mode 120000 index 7f725c5..0000000 --- a/share/scripts/progress-linux +++ /dev/null @@ -1 +0,0 @@ -debconf \ No newline at end of file diff --git a/share/scripts/progress-linux.d b/share/scripts/progress-linux.d deleted file mode 120000 index 4ce36fe..0000000 --- a/share/scripts/progress-linux.d +++ /dev/null @@ -1 +0,0 @@ -debconf.d \ No newline at end of file diff --git a/share/systemd/container-autostart.service b/share/systemd/container-autostart.service index 1424ce8..076aa41 100644 --- a/share/systemd/container-autostart.service +++ b/share/systemd/container-autostart.service @@ -1,6 +1,6 @@ [Unit] Description=container-tools automatic start -After=syslog.target network.target +After=network.target [Service] Type=oneshot -- cgit v1.2.3