Merging upstream version 20180118.

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

4 files changed, 32 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}'."
diff --git a/share/scripts/debconf.d/0001-preseed-file b/share/scripts/debconf.d/0001-preseed-file
index d3cc49d..5b646c4 100755
--- a/share/scripts/debconf.d/0001-preseed-file
+++ b/share/scripts/debconf.d/0001-preseed-file
@@ -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
@@ -30,6 +32,17 @@ then
 	# user specified one or more preseed files through commandline option
 	db_set cnt-debconf/preseed-file "${PRESEED_FILE}"
 	db_fset cnt-debconf/preseed-file seen true
+elif [ -e "${CONFIG}/${NAME}.cfg" ]
+then
+	# user did not specify a pressed file, but there is a matching one
+	# available on the system matching the container name
+	db_set cnt-debconf/preseed-file "${CONFIG}/${NAME}.cfg"
+	db_fset cnt-debconf/preseed-file seen true
+elif [ -e "${CONFIG}/default.cfg" ]
+then
+	# user did not specify a pressed file, but there is a default one
+	db_set cnt-debconf/preseed-file "${CONFIG}/default.cfg"
+	db_fset cnt-debconf/preseed-file seen true
 elif ls "${CONFIG}"/*.cfg > /dev/null 2>&1
 then
 	# user has not specified preseed files through commandline option,
diff --git a/share/scripts/debconf.d/0002-preseed-debconf b/share/scripts/debconf.d/0002-preseed-debconf
index d46121c..3a96ad4 100755
--- a/share/scripts/debconf.d/0002-preseed-debconf
+++ b/share/scripts/debconf.d/0002-preseed-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
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index 1773b09..4395abc 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-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