diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2017-01-04 10:41:54 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2017-01-04 10:42:45 +0000 |
| commit | e81986238b9faadd633c22883bd4aa6152111c00 (patch) | |
| tree | bd83e33713d27157ea8e8100ddc50ad9fd1844b7 | |
| parent | Releasing debian version 20161220-1. (diff) | |
| download | open-infrastructure-compute-tools-e81986238b9faadd633c22883bd4aa6152111c00.tar.xz open-infrastructure-compute-tools-e81986238b9faadd633c22883bd4aa6152111c00.zip | |
Merging upstream version 20170101.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
45 files changed, 176 insertions, 159 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8b1712f..c985fe1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,18 @@ +2017-01-01 Daniel Baumann <daniel.baumann@open-infrastructure.net> + + * Releasing version 20170101. + + [ Daniel Baumann ] + * Updating year in copyright information for 2017. + * Adding -f, --force option in container auto command. + * Adding net-tools in container-tools manpage to the list of packages to install. + * Adding net-tools to required packages in host-setup documentation. + * Adding bash-completion for container auto command. + * Adding bash-completion for container move command. + * Adding bash-completion for container version command. + * Using generic directory instead of local directory for debconf files to bash-complete container create command. + * Reordering bash-completion to do completion the usual way (by suggesting commands first, then options and finally their arguments, rather than commands and arguments only). + 2016-12-20 Daniel Baumann <daniel.baumann@open-infrastructure.net> * Releasing version 20161220. @@ -1,7 +1,7 @@ # Makefile # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/bin/container b/bin/container index 5b97d3e..a23f274 100755 --- a/bin/container +++ b/bin/container @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/bin/container-nsenter b/bin/container-nsenter index 7c83361..bf47331 100755 --- a/bin/container-nsenter +++ b/bin/container-nsenter @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/bin/container-shell b/bin/container-shell index 3a14f7d..17c0849 100755 --- a/bin/container-shell +++ b/bin/container-shell @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/lib/container/auto b/lib/container/auto index 969ce0a..45aa68f 100755 --- a/lib/container/auto +++ b/lib/container/auto @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 @@ -25,8 +25,8 @@ HOOKS="/etc/container-tools/hooks" Parameters () { - GETOPT_LONGOPTIONS="start,stop," - GETOPT_OPTIONS="s,t," + GETOPT_LONGOPTIONS="force,start,stop," + GETOPT_OPTIONS="f,s,t," PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})" @@ -41,6 +41,11 @@ Parameters () while true do case "${1}" in + -f|--force) + FORCE="true" + shift 1 + ;; + -s|--start) ACTION="start" shift 1 @@ -66,7 +71,7 @@ Parameters () Usage () { - echo "Usage: container ${COMMAND} -s|--start -t|--stop" >&2 + echo "Usage: container ${COMMAND} -f|--force -s|--start -t|--stop" >&2 exit 1 } @@ -89,13 +94,21 @@ do done # Run +OPTIONS="" + +case "${FORCE}" in + true) + OPTIONS="${OPTIONS} -f" + ;; +esac + for FILE in "${CONFIG}"/*.conf do if grep -Eqs "^ *cnt.auto=true" "${FILE}" || grep -Eqs "^ *cnt.auto=${HOST}" "${FILE}" then CONTAINER="$(basename ${FILE} .conf)" - cnt ${ACTION} -n ${CONTAINER} || true + cnt ${ACTION} -n ${CONTAINER} ${OPTIONS} || true fi done diff --git a/lib/container/console b/lib/container/console index fbf3c2d..13bceb9 100755 --- a/lib/container/console +++ b/lib/container/console @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/lib/container/create b/lib/container/create index 1e855ef..54cbb1d 100755 --- a/lib/container/create +++ b/lib/container/create @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/lib/container/enter b/lib/container/enter index 4bcd5c6..dc2dd09 100755 --- a/lib/container/enter +++ b/lib/container/enter @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/lib/container/limit b/lib/container/limit index d2a193a..b888656 100755 --- a/lib/container/limit +++ b/lib/container/limit @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/lib/container/list b/lib/container/list index da8a158..9608fd7 100755 --- a/lib/container/list +++ b/lib/container/list @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/lib/container/move b/lib/container/move index 6e855e4..78b0c7f 100755 --- a/lib/container/move +++ b/lib/container/move @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/lib/container/remove b/lib/container/remove index eec3b02..03549a4 100755 --- a/lib/container/remove +++ b/lib/container/remove @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/lib/container/restart b/lib/container/restart index 1c4c591..a5c2b93 100755 --- a/lib/container/restart +++ b/lib/container/restart @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/lib/container/start b/lib/container/start index 40ee195..0009fd0 100755 --- a/lib/container/start +++ b/lib/container/start @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/lib/container/stop b/lib/container/stop index e91d0c6..b8793ac 100755 --- a/lib/container/stop +++ b/lib/container/stop @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/lib/container/version b/lib/container/version index f72355e..89790e9 100755 --- a/lib/container/version +++ b/lib/container/version @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/share/bash-completion/container b/share/bash-completion/container index 8d54ba4..0bc22c0 100644 --- a/share/bash-completion/container +++ b/share/bash-completion/container @@ -36,218 +36,204 @@ _container() fi case "${cmd}" in + auto) + opts="-f --force -s --start -t --stop" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + ;; + console) - case "${cur}" in - -*) - opts="-n --name" + case "${prev}" in + -n|--name) + opts=$(container list -s -f shell) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; *) - case "${prev}" in - -n|--name) - opts=$(container list -s -f shell) - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - esac + opts="-n --name" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 ;; esac ;; create) - case "${cur}" in - -*) - opts="-n --name -c --capability -d --drop-capability -s --script -b --bind" + case "${prev}" in + -n|--name) + opts=$(cd /etc/container-tools/debconf 2>/dev/null && ls *.cfg 2>/dev/null | sed -e 's/.cfg$//g') + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + ;; + + -s|--script) + opts=$(cd /usr/share/container-tools/scripts && find -maxdepth 1 -not -type d -and -not -name 'default' -and -not -name 'debconf' -and -not -name '*.d' -printf '%P\n' | sort) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; *) - case "${prev}" in - -n|--name) - opts=$(cd /srv/container/container-tools/debconf 2>/dev/null && ls *.cfg 2>/dev/null | sed -e 's/.cfg$//g') - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - - -s|--script) - opts=$(cd /usr/share/container-tools/scripts && find -maxdepth 1 -not -type d -and -not -name 'default' -and -not -name 'debconf' -and -not -name '*.d' -printf '%P\n' | sort) - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - esac + opts="-n --name -c --capability -d --drop-capability -s --script -b --bind" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 ;; esac ;; enter) - case "${cur}" in - -*) - opts="-n --name" + case "${prev}" in + -n|--name) + opts=$(container list -s -f shell) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; *) - case "${prev}" in - -n|--name) - opts=$(container list -s -f shell) - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - esac + opts="-n --name" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 ;; esac ;; limit) - case "${cur}" in - -*) - opts="-n --name --blockio-device-weight --blockio-read-bandwith -b --blockio-weight --blockio-write-bandwith -c --cpu-quota --cpu-shares -m --memory-limit -t --tasks-max" + case "${prev}" in + -n|--name) + opts=$(container list -a -f shell) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; *) - case "${prev}" in - -n|--name) - opts=$(container list -a -f shell) - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - esac + opts="-n --name --blockio-device-weight --blockio-read-bandwith -b --blockio-weight --blockio-write-bandwith -c --cpu-quota --cpu-shares -m --memory-limit -t --tasks-max" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 ;; esac ;; list|ls) - case "${cur}" in - -*) + case "${prev}" in + -h|--host) + opts="true false $(hostname -f)" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + ;; + + -f|--format) + opts="cli csv json nwdiag shell yaml xml" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + ;; + + *) opts="-a --all -f --format -h --host -o --other -s --started -t --stopped" COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; + esac + ;; + + move|mv) + case "${prev}" in + -o|--old) + opts=$(container list -t -f shell) + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + ;; *) - case "${prev}" in - -h|--host) - opts="true false $(hostname -f)" - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - - -f|--format) - opts="cli csv json nwdiag shell yaml xml" - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - esac + opts="-f --force -n --new -o --old" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 ;; esac ;; remove|rm) - case "${cur}" in - -*) - opts="-n --name -f --force" + case "${prev}" in + -n|--name) + opts=$(container list -t -f shell) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; *) - case "${prev}" in - -n|--name) - opts=$(container list -t -f shell) - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - esac + opts="-n --name -f --force" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 ;; esac ;; restart) - case "${cur}" in - -*) - opts="-n --name" + case "${prev}" in + -n|--name) + opts=$(container list -s -f shell) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; *) - case "${prev}" in - -n|--name) - opts=$(container list -s -f shell) - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - esac + opts="-n --name" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 ;; esac ;; start) - case "${cur}" in - -*) - opts="-n --name" + case "${prev}" in + -n|--name) + opts=$(container list -t -f shell) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; *) - case "${prev}" in - -n|--name) - opts=$(container list -t -f shell) - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - esac + opts="-n --name" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 ;; esac ;; status) - case "${cur}" in - -*) - opts="-n --name" + case "${prev}" in + -n|--name) + opts=$(container list -t -f shell) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; *) - case "${prev}" in - -n|--name) - opts=$(container list -t -f shell) - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - esac + opts="-n --name" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 ;; esac ;; stop) - case "${cur}" in - -*) - opts="-n --name -f --force" + case "${prev}" in + -n|--name) + opts=$(container list -s -f shell) COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; *) - case "${prev}" in - -n|--name) - opts=$(container list -s -f shell) - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - ;; - esac + opts="-n --name -f --force" + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 ;; esac ;; + version) + return 0 + ;; + *) local commands=$(cd /usr/lib/container-tools/container 2>/dev/null && find * -type f -print) COMPREPLY=( $(compgen -W "${commands}" -- ${cur}) ) diff --git a/share/doc/HOST-SETUP.txt b/share/doc/HOST-SETUP.txt index c77f829..73d1ce1 100644 --- a/share/doc/HOST-SETUP.txt +++ b/share/doc/HOST-SETUP.txt @@ -5,7 +5,7 @@ container-tools: Host Setup 1. Debian Packages ------------------- -apt install bridge-utils ifenslave vlan +apt install net-tools bridge-utils ifenslave vlan 2. Boot Parameters diff --git a/share/doc/asciicast/introduction.sh b/share/doc/asciicast/introduction.sh index 18dfdaf..5341075 100755 --- a/share/doc/asciicast/introduction.sh +++ b/share/doc/asciicast/introduction.sh @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/share/man/Makefile b/share/man/Makefile index decf333..5141ced 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -1,7 +1,7 @@ # Makefile # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/share/man/container-auto.1.txt b/share/man/container-auto.1.txt index 0eb76d2..5aaf0d1 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 @@ -41,6 +41,9 @@ OPTIONS ------- The following container options are available: +*-f, --force*:: + Removing stray lock file if existing. + *-s, --start*:: Start all container on the host system. diff --git a/share/man/container-console.1.txt b/share/man/container-console.1.txt index 7b25125..add4fc0 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-create-curl.1.txt b/share/man/container-create-curl.1.txt index e046b24..a1bd487 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt index a51dfef..2b5c37c 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt index 9de3f94..5b3b815 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt index 0fd5187..9176b84 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-enter.1.txt b/share/man/container-enter.1.txt index 42a7211..43d1721 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-limit.1.txt b/share/man/container-limit.1.txt index 9fc9cba..f942fba 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt index d964c4e..abb4c8f 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-move.1.txt b/share/man/container-move.1.txt index 43e04bc..0c682d3 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt index 843fa5e..917311d 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-restart.1.txt b/share/man/container-restart.1.txt index 2aed923..c2b2d39 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt index 38a8034..6d792b8 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-start.1.txt b/share/man/container-start.1.txt index 64c4b3c..5210d08 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt index 07426af..95c67e4 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container-tools.7.txt b/share/man/container-tools.7.txt index b6c83d6..9f9aba4 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 @@ -48,7 +48,7 @@ INSTALLATION SOURCE ~~~~~~ - 1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc dbus systemd-container + 1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc dbus systemd-container net-tools 2. git clone https://sources.open-infrastructure.net/software/container-tools 3. cd container-tools && sudo make install diff --git a/share/man/container-version.1.txt b/share/man/container-version.1.txt index bb11d40..d3a59f8 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/man/container.1.txt b/share/man/container.1.txt index f76bbda..7708c6a 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-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +// Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> // // 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 diff --git a/share/scripts/curl b/share/scripts/curl index 69badd9..67691e3 100755 --- a/share/scripts/curl +++ b/share/scripts/curl @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/share/scripts/debconf b/share/scripts/debconf index 72e9c85..5fc9542 100755 --- a/share/scripts/debconf +++ b/share/scripts/debconf @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/share/scripts/debconf.d/0001-preseed-file b/share/scripts/debconf.d/0001-preseed-file index 03976d2..663fdc8 100755 --- a/share/scripts/debconf.d/0001-preseed-file +++ b/share/scripts/debconf.d/0001-preseed-file @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/share/scripts/debconf.d/0002-preseed-debconf b/share/scripts/debconf.d/0002-preseed-debconf index 7020431..05b9379 100755 --- a/share/scripts/debconf.d/0002-preseed-debconf +++ b/share/scripts/debconf.d/0002-preseed-debconf @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf index 77dc030..1364bd0 100755 --- a/share/scripts/debconf.d/0003-debconf +++ b/share/scripts/debconf.d/0003-debconf @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap index 2da573d..ecf167c 100755 --- a/share/scripts/debootstrap +++ b/share/scripts/debootstrap @@ -1,7 +1,7 @@ #!/bin/sh # container-tools - Manage systemd-nspawn containers -# Copyright (C) 2014-2016 Daniel Baumann <daniel.baumann@open-infrastructure.net> +# Copyright (C) 2014-2017 Daniel Baumann <daniel.baumann@open-infrastructure.net> # # 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 |