diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-02-17 17:40:15 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-02-17 17:40:15 +0000 |
| commit | 5776f47d6e5ee4fe7797ec31aad2e3bbbb08b8d2 (patch) | |
| tree | 64b345517eadfb03724eda8deebd56ec917fba69 /lib/container/create | |
| parent | Adding upstream version 20180825. (diff) | |
| download | open-infrastructure-compute-tools-5776f47d6e5ee4fe7797ec31aad2e3bbbb08b8d2.tar.xz open-infrastructure-compute-tools-5776f47d6e5ee4fe7797ec31aad2e3bbbb08b8d2.zip | |
Adding upstream version 20190217.upstream/20190217
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'lib/container/create')
| -rwxr-xr-x | lib/container/create | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/container/create b/lib/container/create index 561584c..73c5493 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+ # @@ -22,10 +21,11 @@ set -e COMMAND="$(basename ${0})" -CONFIG="/etc/container-tools/config" -HOOKS="/etc/container-tools/hooks" +CONFIG="/etc/compute-tools/container/config" +HOOKS="/etc/compute-tools/container/hooks" MACHINES="/var/lib/machines" -SCRIPTS="/usr/share/container-tools/scripts" +SCRIPTS="/usr/share/compute-tools/container/scripts" +CONFIG_TEMPLATE="/usr/share/compute-tools/container/config/container.conf.in" Parameters () { @@ -141,8 +141,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 @@ -251,7 +251,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| -- | |') |