diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-01-19 09:53:27 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2018-01-19 09:53:27 +0000 |
| commit | 856b8e136a903883ed36c790ef715ffd35eff3f7 (patch) | |
| tree | fadc80711552ec1fe0d68f28da870551fe89462a /share/scripts/debconf | |
| parent | Adding upstream version 20171101. (diff) | |
| download | open-infrastructure-compute-tools-856b8e136a903883ed36c790ef715ffd35eff3f7.tar.xz open-infrastructure-compute-tools-856b8e136a903883ed36c790ef715ffd35eff3f7.zip | |
Adding upstream version 20180118.upstream/20180118
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/scripts/debconf')
| -rwxr-xr-x | share/scripts/debconf | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/share/scripts/debconf b/share/scripts/debconf index 3bc3b43..ee23ebc 100755 --- a/share/scripts/debconf +++ b/share/scripts/debconf @@ -3,6 +3,8 @@ # container-tools - Manage systemd-nspawn containers # Copyright (C) 2014-2017 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 @@ -933,17 +935,6 @@ Commands () { DIRECTORY="${1}" - if [ -n "${HOST_COMMAND}" ] - then - echo "${HOST_COMMAND}" > "${DIRECTORY}/.host-command" - - cd "${DIRECTORY}" - sh "${DIRECTORY}/.host-command" - cd "${OLDPWD}" - - rm -f "${DIRECTORY}/.host-command" - fi - # config (FIXME) # maximum of 15 characters, prefix is 'veth-' @@ -985,6 +976,19 @@ Commands () # Setting root password echo root:${ROOT_PASSWORD} | chroot "${DIRECTORY}" chpasswd + # Host command + if [ -n "${HOST_COMMAND}" ] + then + echo "${HOST_COMMAND}" > "${DIRECTORY}/.host-command" + + cd "${DIRECTORY}" + sh "${DIRECTORY}/.host-command" + cd "${OLDPWD}" + + rm -f "${DIRECTORY}/.host-command" + fi + + # Show root password in case its automatically set case "${ROOT_RANDOM_PASSWORD}" in true) echo "${NAME}: root password set to '${ROOT_PASSWORD}'." |