From 35931568028715ceb35f5a2a1e42b28bc95d0cc5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 21 Jan 2020 21:28:36 +0100 Subject: Merging upstream version 20200121. Signed-off-by: Daniel Baumann --- CHANGELOG.txt | 9 +++++++++ Makefile | 2 +- VERSION.txt | 2 +- bin/container | 2 +- bin/container-shell | 2 +- lib/container/auto | 2 +- lib/container/console | 2 +- lib/container/create | 2 +- lib/container/enter | 2 +- lib/container/key | 2 +- lib/container/limit | 2 +- lib/container/list | 2 +- lib/container/log | 2 +- lib/container/move | 2 +- lib/container/remove | 2 +- lib/container/restart | 2 +- lib/container/start | 10 +++++++--- lib/container/stop | 2 +- lib/container/top | 2 +- lib/container/version | 2 +- share/bash-completion/container | 4 ++-- share/hooks/pre-create.git-pull.sh | 2 +- share/man/Makefile | 4 ++-- share/man/compute-tools.7.txt | 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-log.1.txt | 2 +- share/man/container-move.1.txt | 2 +- share/man/container-remove.1.txt | 2 +- share/man/container-restart.1.txt | 2 +- share/man/container-shell.1.txt | 2 +- share/man/container-start.1.txt | 5 ++++- share/man/container-stop.1.txt | 2 +- share/man/container-top.1.txt | 2 +- share/man/container-version.1.txt | 2 +- share/man/container.1.txt | 2 +- share/scripts/curl | 2 +- share/scripts/curl.d/0001-debconf | 2 +- share/scripts/debconf | 2 +- share/scripts/debconf.d/0001-preseed-file | 2 +- share/scripts/debconf.d/0002-preseed-debconf | 2 +- share/scripts/debconf.d/0003-debconf | 2 +- share/scripts/debootstrap | 2 +- 51 files changed, 70 insertions(+), 54 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8764b8c..336b9c7 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,12 @@ +2020-01-21 Daniel Baumann + + * Releasing version 20200121. + + [ Daniel Baumann ] + * Fixing FTBFS with newer asciidoc versions. + * Adding verbose option for container start command. + * Updating copyright notices for 2020. + 2019-11-04 Daniel Baumann * Releasing version 20191104. diff --git a/Makefile b/Makefile index c5bdd5c..13a4661 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/VERSION.txt b/VERSION.txt index 6bd7a98..6de2f45 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20191104 +20200121 diff --git a/bin/container b/bin/container index d845fa7..3ab1a69 100755 --- a/bin/container +++ b/bin/container @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/bin/container-shell b/bin/container-shell index fe113d3..27bc5a2 100755 --- a/bin/container-shell +++ b/bin/container-shell @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/auto b/lib/container/auto index 83c9a57..16c2933 100755 --- a/lib/container/auto +++ b/lib/container/auto @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/console b/lib/container/console index 0b49058..0628a9d 100755 --- a/lib/container/console +++ b/lib/container/console @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/create b/lib/container/create index 1b9defe..46fc7ee 100755 --- a/lib/container/create +++ b/lib/container/create @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/enter b/lib/container/enter index 10a122f..4c7f890 100755 --- a/lib/container/enter +++ b/lib/container/enter @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/key b/lib/container/key index 1b59555..f4e337c 100755 --- a/lib/container/key +++ b/lib/container/key @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/limit b/lib/container/limit index b1ec170..42f36a2 100755 --- a/lib/container/limit +++ b/lib/container/limit @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/list b/lib/container/list index 5427c90..24457de 100755 --- a/lib/container/list +++ b/lib/container/list @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/log b/lib/container/log index b220b5f..2740213 100755 --- a/lib/container/log +++ b/lib/container/log @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/move b/lib/container/move index 278f972..cdabbe4 100755 --- a/lib/container/move +++ b/lib/container/move @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/remove b/lib/container/remove index 13a9bd8..404b80d 100755 --- a/lib/container/remove +++ b/lib/container/remove @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/restart b/lib/container/restart index 5b78dda..f78cfff 100755 --- a/lib/container/restart +++ b/lib/container/restart @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/start b/lib/container/start index 13fc6ef..f89944d 100755 --- a/lib/container/start +++ b/lib/container/start @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # @@ -34,8 +34,8 @@ Parameters () { OPTIONS_ALL="" - GETOPT_LONGOPTIONS="name:,force,nspawn,start," - GETOPT_OPTIONS="n:f," + GETOPT_LONGOPTIONS="name:,force,nspawn,start,verbose," + GETOPT_OPTIONS="n:,f,v," PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})" @@ -75,6 +75,10 @@ Parameters () shift 1 ;; + -v|--verbose) + VERBOSE="true" + ;; + --) shift 1 break diff --git a/lib/container/stop b/lib/container/stop index 350d9e6..a6bb761 100755 --- a/lib/container/stop +++ b/lib/container/stop @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/top b/lib/container/top index 4978568..81c7436 100755 --- a/lib/container/top +++ b/lib/container/top @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/lib/container/version b/lib/container/version index d356c3e..8efc91c 100755 --- a/lib/container/version +++ b/lib/container/version @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/share/bash-completion/container b/share/bash-completion/container index d791ff6..95199b1 100644 --- a/share/bash-completion/container +++ b/share/bash-completion/container @@ -1,7 +1,7 @@ # bash-completion # # Copyright (C) 2016 Andreas Kreuzer -# Copyright (C) 2016-2019 Daniel Baumann +# Copyright (C) 2016-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # @@ -236,7 +236,7 @@ _container() ;; *) - opts="-n --name" + opts="-n --name -v --verbose" COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; diff --git a/share/hooks/pre-create.git-pull.sh b/share/hooks/pre-create.git-pull.sh index a82a7a0..582479e 100755 --- a/share/hooks/pre-create.git-pull.sh +++ b/share/hooks/pre-create.git-pull.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/share/man/Makefile b/share/man/Makefile index 4f5b682..535b2b1 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -1,6 +1,6 @@ # Makefile -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # @@ -20,7 +20,7 @@ # Depends: asciidoc dblatex docbook-xsl libxml2-utils source-highlight A2X = a2x \ - --asciidoc-opts "-a revdate=$(shell cat ../../VERSION.txt)" \ + --asciidoc-opts="-a revdate=$(shell cat ../../VERSION.txt)" \ --doctype=manpage SHELL := sh -e diff --git a/share/man/compute-tools.7.txt b/share/man/compute-tools.7.txt index 5a4d6db..bcd234f 100644 --- a/share/man/compute-tools.7.txt +++ b/share/man/compute-tools.7.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 0d0a633..b1aa550 100644 --- a/share/man/container-auto.1.txt +++ b/share/man/container-auto.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 54cf242..7f4fb03 100644 --- a/share/man/container-console.1.txt +++ b/share/man/container-console.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 40028c9..c15ee4e 100644 --- a/share/man/container-create-curl.1.txt +++ b/share/man/container-create-curl.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 ecc30a6..0381cae 100644 --- a/share/man/container-create-debconf.1.txt +++ b/share/man/container-create-debconf.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 43950af..6acdbeb 100644 --- a/share/man/container-create-debootstrap.1.txt +++ b/share/man/container-create-debootstrap.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 7f1f0a9..7770d9b 100644 --- a/share/man/container-create.1.txt +++ b/share/man/container-create.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 aaf14de..162d510 100644 --- a/share/man/container-enter.1.txt +++ b/share/man/container-enter.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 7e7f376..9463141 100644 --- a/share/man/container-key.1.txt +++ b/share/man/container-key.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 62f0288..c5c2408 100644 --- a/share/man/container-limit.1.txt +++ b/share/man/container-limit.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 897ea9c..15a54c2 100644 --- a/share/man/container-list.1.txt +++ b/share/man/container-list.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-log.1.txt b/share/man/container-log.1.txt index ea5ab91..fa9fe71 100644 --- a/share/man/container-log.1.txt +++ b/share/man/container-log.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 5543ab2..fd6b83d 100644 --- a/share/man/container-move.1.txt +++ b/share/man/container-move.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 cdcda76..afe8d03 100644 --- a/share/man/container-remove.1.txt +++ b/share/man/container-remove.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container-restart.1.txt b/share/man/container-restart.1.txt index d452f32..b0d66e2 100644 --- a/share/man/container-restart.1.txt +++ b/share/man/container-restart.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 0fd1aa9..cd19c69 100644 --- a/share/man/container-shell.1.txt +++ b/share/man/container-shell.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 90750c0..e6c874e 100644 --- a/share/man/container-start.1.txt +++ b/share/man/container-start.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // @@ -49,6 +49,9 @@ The following container options are available: *-f, --force'*:: Removing stray lock file if existing. +*-v, --verbose*:: + Explain what is being done. + EXAMPLES -------- diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt index ec9e48d..4450ba3 100644 --- a/share/man/container-stop.1.txt +++ b/share/man/container-stop.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 b603557..4f41b79 100644 --- a/share/man/container-top.1.txt +++ b/share/man/container-top.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 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 060f393..498d842 100644 --- a/share/man/container-version.1.txt +++ b/share/man/container-version.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/man/container.1.txt b/share/man/container.1.txt index aba9141..02cdc64 100644 --- a/share/man/container.1.txt +++ b/share/man/container.1.txt @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 Daniel Baumann +// Copyright (C) 2014-2020 Daniel Baumann // // SPDX-License-Identifier: GPL-3.0+ // diff --git a/share/scripts/curl b/share/scripts/curl index 6b8db26..ddc624d 100755 --- a/share/scripts/curl +++ b/share/scripts/curl @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/share/scripts/curl.d/0001-debconf b/share/scripts/curl.d/0001-debconf index 3f98f74..6c3699a 100755 --- a/share/scripts/curl.d/0001-debconf +++ b/share/scripts/curl.d/0001-debconf @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/share/scripts/debconf b/share/scripts/debconf index f3632f4..197791a 100755 --- a/share/scripts/debconf +++ b/share/scripts/debconf @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/share/scripts/debconf.d/0001-preseed-file b/share/scripts/debconf.d/0001-preseed-file index d9ff245..2c83675 100755 --- a/share/scripts/debconf.d/0001-preseed-file +++ b/share/scripts/debconf.d/0001-preseed-file @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/share/scripts/debconf.d/0002-preseed-debconf b/share/scripts/debconf.d/0002-preseed-debconf index 8877654..a9c7e77 100755 --- a/share/scripts/debconf.d/0002-preseed-debconf +++ b/share/scripts/debconf.d/0002-preseed-debconf @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf index 1e0a99a..c5925f2 100755 --- a/share/scripts/debconf.d/0003-debconf +++ b/share/scripts/debconf.d/0003-debconf @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap index 61f5e13..f69d006 100755 --- a/share/scripts/debootstrap +++ b/share/scripts/debootstrap @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2014-2019 Daniel Baumann +# Copyright (C) 2014-2020 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ # -- cgit v1.2.3