Merging upstream version 20190222.

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

16 files changed, 279 insertions, 94 deletions

diff --git a/lib/container/auto b/lib/container/auto
index 8477915..83c9a57 100755
--- a/lib/container/auto
+++ b/lib/container/auto
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,10 +19,12 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/container-tools/config"
-HOOKS="/etc/container-tools/hooks"
+CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 
 Parameters ()
 {
@@ -73,7 +74,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} -f|--force -s|--start -t|--stop" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -f|--force -s|--start -t|--stop" >&2
 	exit 1
 }
 
@@ -84,7 +85,7 @@ then
 	Usage
 fi
 
-HOST="$(hostname -f)"
+HOST="$(hostname -f 2> /dev/null || hostname)"
 
 # Pre hooks
 for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${NAME}.pre-${COMMAND}"
diff --git a/lib/container/console b/lib/container/console
index dfc9b5c..0b49058 100755
--- a/lib/container/console
+++ b/lib/container/console
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,9 +19,11 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-HOOKS="/etc/container-tools/hooks"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
@@ -63,7 +64,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} -n|--name NAME" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME" >&2
 	exit 1
 }
 
diff --git a/lib/container/create b/lib/container/create
index 561584c..43cad9b 100755
--- a/lib/container/create
+++ b/lib/container/create
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,12 +19,15 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/container-tools/config"
-HOOKS="/etc/container-tools/hooks"
+CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
-SCRIPTS="/usr/share/container-tools/scripts"
+SCRIPTS="/usr/share/${PROJECT}/${PROGRAM}/scripts"
+CONFIG_TEMPLATE="/usr/share/${PROJECT}/${PROGRAM}/config/container.conf.in"
 
 Parameters ()
 {
@@ -110,7 +112,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} -n|--name NAME [--cnt.container-server=true|false|FQDN] [--cnt.overlay=DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [--bind-ro DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-v|--verbose] [-- SCRIPT_OPTIONS]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--cnt.container-server=true|false|FQDN] [--cnt.overlay=DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [--bind-ro DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-v|--verbose] [-- SCRIPT_OPTIONS]" >&2
 	exit 1
 }
 
@@ -141,8 +143,8 @@ then
 		TARGET="$(basename $(readlink ${SCRIPTS}/default))"
 
 		case "${TARGET}" in
-			container-tools_script)
-				TARGET="$(basename $(readlink /etc/alternatives/container-tools_script))"
+			container_script)
+				TARGET="$(basename $(readlink /etc/alternatives/container_script))"
 				;;
 		esac
 
@@ -176,7 +178,7 @@ EOF
 		;;
 esac
 
-CNT_CONTAINER_SERVER="${CNT_CONTAINER_SERVER:-$(hostname -f)}"
+CNT_CONTAINER_SERVER="${CNT_CONTAINER_SERVER:-$(hostname -f 2> /dev/null || hostname)}"
 
 # Pre hooks
 for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${NAME}.pre-${COMMAND}"
@@ -251,7 +253,7 @@ sed	-e "s|@CNT_AUTO@|${CNT_AUTO}|g" \
 	-e "s|@NETWORK_VETH_EXTRA@|${NETWORK_VETH_EXTRA}|g" \
 	-e "s|@PRIVATE_USERS@|no|g" \
 	-e "s|@REGISTER@|yes|g" \
-/usr/share/container-tools/config/container.conf.in > "${CONFIG}/${NAME}.conf"
+"${CONFIG_TEMPLATE}" > "${CONFIG}/${NAME}.conf"
 
 # Run
 "${SCRIPTS}/${SCRIPT}" $(echo "${@}" | sed -e 's| -- | |')
diff --git a/lib/container/enter b/lib/container/enter
index 72b3b1c..9c9ebfa 100755
--- a/lib/container/enter
+++ b/lib/container/enter
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,9 +19,11 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-HOOKS="/etc/container-tools/hooks"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
@@ -63,7 +64,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} -n|--name NAME" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME" >&2
 	exit 1
 }
 
diff --git a/lib/container/key b/lib/container/key
index 3f0f57b..1b59555 100755
--- a/lib/container/key
+++ b/lib/container/key
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,9 +19,11 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-KEYS="/etc/container-tools/keys"
+KEYS="/etc/${PROJECT}/${PROGRAM}/keys"
 
 Parameters ()
 {
@@ -74,7 +75,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} [-a|--add KEY] [-l|--list] [-r|--remove KEY]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} [-a|--add KEY] [-l|--list] [-r|--remove KEY]" >&2
 	exit 1
 }
 
diff --git a/lib/container/limit b/lib/container/limit
index f2d6bfa..b1ec170 100755
--- a/lib/container/limit
+++ b/lib/container/limit
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,9 +19,11 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-HOOKS="/etc/container-tools/hooks"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
@@ -103,7 +104,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} -n|--name NAME [--blockio-device-weight \"DEVICE WEIGHT\"] [--blockio-read-bandwidth \"DEVICE BYTES\"] [-b|--blockio-weight WEIGHT] [--blockio-write-bandwidth \"DEVICE BYTES\"] [-c|--cpu-quota QUOTA] [--cpu-shares SHARES] [-m|--memory-limit BYTES] [-t|--tasks-max NUMBER]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--blockio-device-weight \"DEVICE WEIGHT\"] [--blockio-read-bandwidth \"DEVICE BYTES\"] [-b|--blockio-weight WEIGHT] [--blockio-write-bandwidth \"DEVICE BYTES\"] [-c|--cpu-quota QUOTA] [--cpu-shares SHARES] [-m|--memory-limit BYTES] [-t|--tasks-max NUMBER]" >&2
 	exit 1
 }
 
diff --git a/lib/container/list b/lib/container/list
index 816d521..62f6a5b 100755
--- a/lib/container/list
+++ b/lib/container/list
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,13 +19,15 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/container-tools/config"
-HOOKS="/etc/container-tools/hooks"
+CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
 
-VERSION="$(container version)"
+VERSION="$(${PROGRAM} version)"
 
 Parameters ()
 {
@@ -106,7 +107,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} [-a|--all] [--csv-separator SEPARATOR] [--format FORMAT] [-h|--host HOSTNAME] [--nwdiag-color COLOR] [--nwdiag-label LABEL] [-o|--other] [-s|--started] [-t|--stopped]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} [-a|--all] [--csv-separator SEPARATOR] [--format FORMAT] [-h|--host HOSTNAME] [--nwdiag-color COLOR] [--nwdiag-label LABEL] [-o|--other] [-s|--started] [-t|--stopped]" >&2
 	exit 1
 }
 
@@ -114,7 +115,7 @@ Parameters "${@}"
 
 LIST="${LIST:-started stopped}"
 FORMAT="${FORMAT:-cli}"
-HOST="${HOST:-$(hostname -f)}"
+HOST="${HOST:-$(hostname -f 2> /dev/null || hostname)}"
 
 CSV_SEPARATOR="${CSV_SEPARATOR:-,}"
 
@@ -233,7 +234,7 @@ EOF
 	csv)
 
 cat << EOF
-# container-tools version ${VERSION}
+# compute-tools ${VERSION}
 Host${CSV_SEPARATOR}Container${CSV_SEPARATOR}Status${CSV_SEPARATOR}IPv4-Address
 EOF
 
@@ -243,7 +244,7 @@ EOF
 
 cat << EOF
 {
-  "container-tools": {
+  "compute-tools": {
     "version": "${VERSION}",
   },
   "host": {
@@ -258,7 +259,7 @@ EOF
 		NETWORK="$(echo ${HOST} | sed -e 's|\.|_|g')"
 
 cat << EOF
-# container-tools ${VERSION}
+# compute-tools ${VERSION}
 nwdiag {
   external_connector = none;
   network ${NETWORK} {
@@ -294,7 +295,7 @@ EOF
 
 cat << EOF
 ---
-container_tools:
+compute_tools:
     version:  ${VERSION}
 
 host:
@@ -308,9 +309,9 @@ EOF
 	xml)
 
 cat << EOF
-<container-tools>
+<compute-tools>
   <version>${VERSION}</version>
-</container-tools>
+</compute-tools>
 <host>
   <name>${HOST}</name>
 </host>
diff --git a/lib/container/log b/lib/container/log
new file mode 100755
index 0000000..200177c
--- /dev/null
+++ b/lib/container/log
@@ -0,0 +1,145 @@
+#!/bin/sh
+
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+#
+# SPDX-License-Identifier: GPL-3.0+
+#
+# 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 <http://www.gnu.org/licenses/>.
+
+set -e
+
+PROJECT="open-infrastructure"
+PROGRAM="container"
+COMMAND="$(basename ${0})"
+
+LOG="/var/log/${PROJECT}/${PROGRAM}.log"
+
+Parameters ()
+{
+	GETOPT_LONGOPTIONS="name:,date:,"
+	GETOPT_OPTIONS="n:,d:,"
+
+	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
+
+	if [ "${?}" != "0" ]
+	then
+		echo "'${COMMAND}': getopt exit" >&2
+		exit 1
+	fi
+
+	eval set -- "${PARAMETERS}"
+
+	while true
+	do
+		case "${1}" in
+			-d|--date)
+				DATE="${2}"
+				shift 2
+				;;
+
+			-n|--name)
+				NAME="${2}"
+				shift 2
+				;;
+
+			-u|--user)
+				USER="${2}"
+				shift 2
+				;;
+
+			--)
+				shift 1
+				break
+				;;
+
+			*)
+				echo "'${COMMAND}': getopt error" >&2
+				exit 1
+				;;
+		esac
+	done
+}
+
+Usage ()
+{
+	echo "Usage: ${PROGRAM} ${COMMAND} [-n|--name NAME] [-d|--date DATE|today|today-N|yesterday] [-u|--user USER]" >&2
+	exit 1
+}
+
+Parameters "${@}"
+
+case "${DATE}" in
+	today-*)
+		DAYS="$(echo ${DATE} | awk -F- '{ print $2 }')"
+
+		START="$(date -d "${DAYS} day ago" '+%Y-%m-%d')"
+		END="$(date +%Y-%m-%d)"
+
+		DATE="(${START}"
+
+		while true
+		do
+			DATE="${DATE}|${START}"
+
+			if [ "${START}" = "${END}" ]
+			then
+				break
+			fi
+
+			START="$(date +%Y-%m-%d --date "${START} +1 day")"
+		done
+
+		DATE="${DATE})"
+		;;
+
+	today)
+		DATE="$(date +%Y-%m-%d)"
+		;;
+
+	yesterday)
+		DATE="$(date -d '1 day ago' '+%Y-%m-%d')"
+		;;
+esac
+
+if ls "${LOG}"-*.gz > /dev/null 2>&1
+then
+	LOGS="$(ls ${LOG}-*.gz) ${LOG}"
+else
+	LOGS="${LOG}"
+fi
+
+# FIXME: user
+
+for LOG in ${LOGS}
+do
+	case "${LOG}" in
+		*.gz)
+			GREP="zgrep"
+			;;
+
+		*)
+			GREP="grep"
+			;;
+	esac
+
+	case "${NAME}" in
+		"")
+			${GREP} -E "^${DATE}" "${LOG}" || true
+			;;
+
+		*)
+			${GREP} -E "^${DATE}" "${LOG}" | grep " ${NAME}" || true
+			;;
+	esac
+done
diff --git a/lib/container/move b/lib/container/move
index e533b0e..278f972 100755
--- a/lib/container/move
+++ b/lib/container/move
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,10 +19,12 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/container-tools/config"
-HOOKS="/etc/container-tools/hooks"
+CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
@@ -74,7 +75,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} [-f|--force] -n|--new NAME -o|--old NAME" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} [-f|--force] -n|--new NAME -o|--old NAME" >&2
 	exit 1
 }
 
@@ -111,7 +112,7 @@ case "${FORCE}" in
 		;;
 
 	*)
-		if container list --other | grep -qs "^${OLD}$"
+		if ${PROGRAM} list --other | grep -qs "^${OLD}$"
 		then
 			echo -n "'${OLD}': rename container to '${NEW}' [y|N]? "
 			read FORCE
diff --git a/lib/container/remove b/lib/container/remove
index 275c867..13a9bd8 100755
--- a/lib/container/remove
+++ b/lib/container/remove
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,10 +19,12 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/container-tools/config"
-HOOKS="/etc/container-tools/hooks"
+CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
@@ -87,7 +88,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} -n|--name NAME [--allow-stop] [-f|--force] [-v|--verbose]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--allow-stop] [-f|--force] [-v|--verbose]" >&2
 	exit 1
 }
 
@@ -121,11 +122,17 @@ fi
 
 case "${NAME}" in
 	ALL)
-		NAMES="$(container list --format shell --stopped)"
+		NAMES="$(${PROGRAM} list --format shell --stopped)"
 
 		for NAME in ${NAMES}
 		do
-			container remove --name ${NAME} ${OPTIONS_ALL} || true
+			case "${VERBOSE}" in
+				true)
+					echo "Removing container ${NAME}..."
+					;;
+			esac
+
+			${PROGRAM} remove --name ${NAME} ${OPTIONS_ALL} || true
 		done
 
 		exit 0
@@ -145,7 +152,7 @@ case "${STATE}" in
 		case "${ALLOW_STOP}" in
 			true)
 				echo "'${NAME}': container is started, stopping it now" >&2
-				container stop -n ${NAME}
+				${PROGRAM} stop -n ${NAME}
 				;;
 
 			*)
diff --git a/lib/container/restart b/lib/container/restart
index a22b970..5b78dda 100755
--- a/lib/container/restart
+++ b/lib/container/restart
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,9 +19,11 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-HOOKS="/etc/container-tools/hooks"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
@@ -65,7 +66,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} -n|--name NAME" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME" >&2
 	exit 1
 }
 
@@ -78,11 +79,17 @@ fi
 
 case "${NAME}" in
 	ALL)
-		NAMES="$(container list --format shell --started)"
+		NAMES="$(${PROGRAM} list --format shell --started)"
 
 		for NAME in ${NAMES}
 		do
-			container restart --name ${NAME} || true
+			case "${VERBOSE}" in
+				true)
+					echo "Restarting container ${NAME}..."
+					;;
+			esac
+
+			${PROGRAM} restart --name ${NAME} || true
 		done
 
 		exit 0
diff --git a/lib/container/start b/lib/container/start
index ac0275e..a63c861 100755
--- a/lib/container/start
+++ b/lib/container/start
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,10 +19,12 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/container-tools/config"
-HOOKS="/etc/container-tools/hooks"
+CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
 
 START="false"
@@ -89,7 +90,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} -n|--name NAME [-f|--force]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [-f|--force]" >&2
 	exit 1
 }
 
@@ -102,11 +103,17 @@ fi
 
 case "${NAME}" in
 	ALL)
-		NAMES="$(container list --format shell --stopped)"
+		NAMES="$(${PROGRAM} list --format shell --stopped)"
 
 		for NAME in ${NAMES}
 		do
-			container start --name ${NAME} ${OPTIONS_ALL} || true
+			case "${VERBOSE}" in
+				true)
+					echo "Starting container ${NAME}..."
+					;;
+			esac
+
+			${PROGRAM} start --name ${NAME} ${OPTIONS_ALL} || true
 		done
 
 		exit 0
@@ -459,7 +466,7 @@ fi
 
 case "${SYSTEMCTL}" in
 	true)
-		systemctl start container@${NAME}.service
+		systemctl start ${PROGRAM}@${NAME}.service
 		# FIXME start console .. after sleep? + configuration option
 		exit 0
 		;;
diff --git a/lib/container/status b/lib/container/status
index 9c5ab20..a4b49e1 100755
--- a/lib/container/status
+++ b/lib/container/status
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
 # Copyright (C) 2016 Simon Spöehel <simon.spoehel@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
@@ -20,10 +19,12 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/container-tools/config"
-HOOKS="/etc/container-tools/hooks"
+CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
 
 Parameters ()
@@ -64,7 +65,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} -n|--name NAME" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME" >&2
 	exit 1
 }
 
@@ -91,7 +92,7 @@ do
 done
 
 # Run
-systemctl status container@${NAME}.service --full
+systemctl status ${PROGRAM}@${NAME}.service --full
 
 # Post hooks
 for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}"
diff --git a/lib/container/stop b/lib/container/stop
index d996282..3a0de2a 100755
--- a/lib/container/stop
+++ b/lib/container/stop
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,10 +19,12 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-CONFIG="/etc/container-tools/config"
-HOOKS="/etc/container-tools/hooks"
+CONFIG="/etc/${PROJECT}/${PROGRAM}/config"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
 MACHINES="/var/lib/machines"
 
 CLEAN="false"
@@ -83,7 +84,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} -n|--name NAME [-f|--force]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [-f|--force]" >&2
 	exit 1
 }
 
@@ -117,11 +118,17 @@ fi
 
 case "${NAME}" in
 	ALL)
-		NAMES="$(container list --format shell --started)"
+		NAMES="$(${PROGRAM} list --format shell --started)"
 
 		for NAME in ${NAMES}
 		do
-			container stop --name ${NAME} ${OPTIONS_ALL} || true
+			case "${VERBOSE}" in
+				true)
+					echo "Stopping container ${NAME}..."
+					;;
+			esac
+
+			${PROGRAM} stop --name ${NAME} ${OPTIONS_ALL} || true
 		done
 
 		exit 0
diff --git a/lib/container/top b/lib/container/top
index 31ec005..4978568 100755
--- a/lib/container/top
+++ b/lib/container/top
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,6 +19,8 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
 Parameters ()
@@ -60,14 +61,14 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container ${COMMAND} [-d|--delay DELAY]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} [-d|--delay DELAY]" >&2
 	exit 1
 }
 
 Parameters "${@}"
 
 DELAY="${DELAY:-1}"
-HOST="$(hostname -f)"
+HOST="$(hostname -f 2> /dev/null || hostname)"
 
 # Pre hooks
 for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${NAME}.pre-${COMMAND}"
@@ -105,7 +106,7 @@ Top ()
 
 trap 'clear' EXIT HUP INT QUIT TERM
 
-Top "container list && printf '%-59s %-19s\n' \"  Host: ${HOST}\" \"\$(date +%Y-%m-%d\ %H:%M:%S)\""
+Top "${PROGRAM} list && printf '%-59s %-19s\n' \"  Host: ${HOST}\" \"\$(date +%Y-%m-%d\ %H:%M:%S)\""
 
 # Post hooks
 for FILE in "${HOOKS}/post-${COMMAND}".* "${HOOKS}/${NAME}.post-${COMMAND}"
diff --git a/lib/container/version b/lib/container/version
index 543d6dc..d356c3e 100755
--- a/lib/container/version
+++ b/lib/container/version
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -20,10 +19,12 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+PROGRAM="container"
 COMMAND="$(basename ${0})"
 
-HOOKS="/etc/container-tools/hooks"
-SHARE="/usr/share/container-tools"
+HOOKS="/etc/${PROJECT}/${PROGRAM}/hooks"
+SHARE="/usr/share/${PROJECT}/${PROGRAM}"
 
 # Pre hooks
 for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${NAME}.pre-${COMMAND}"