From a886751a87e8831df47a7ce9c9952902e7a5623d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sat, 22 Jul 2017 12:48:59 +0200
Subject: Adding cnt-debconf/mode preseed field to allow embedding container
 create script within preseed file itself without relying on a specific
 default create script being set on the host system, thanks to David Kunz for
 the idea.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 share/scripts/debconf | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'share/scripts/debconf')

diff --git a/share/scripts/debconf b/share/scripts/debconf
index 38bf937..e97f41e 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -19,6 +19,7 @@
 set -e
 
 SCRIPT="${0}"
+export SCRIPT
 
 CONFIG="/etc/container-tools/config"
 HOOKS="/etc/container-tools/hooks"
@@ -971,24 +972,10 @@ Commands ()
 
 umask 0022
 
-# Get distributor from template filename
-MODE="$(basename ${SCRIPT})"
-
-case "${MODE}" in
-	debconf)
-		MODE="debian"
-		;;
-esac
-
-export MODE
-
-CACHE="/var/cache/container-tools/${MODE}"
-SYSTEM="${MACHINES}/${NAME}"
+export NAME
 
 Debconf
 
-export NAME
-
 # Pre hooks
 for FILE in "${HOOKS}/pre-${SCRIPT}".* "${HOOKS}/${NAME}.pre-${SCRIPT}"
 do
@@ -999,19 +986,22 @@ do
 done
 
 # Run debconf parts
-for SCRIPT in /usr/share/container-tools/scripts/debconf.d/*
+for DEBCONF_SCRIPT in /usr/share/container-tools/scripts/debconf.d/*
 do
-	if [ -x "${SCRIPT}" ]
+	if [ -x "${DEBCONF_SCRIPT}" ]
 	then
 		# FIXME
-		# debconf -ocontainer-tools "${SCRIPT}"
-		"${SCRIPT}"
+		# debconf -ocontainer-tools "${DEBCONF_SCRIPT}"
+		"${DEBCONF_SCRIPT}"
 	fi
 done
 
 # Read-in configuration from debconf
 . "${DEBCONF_TMPDIR}/debconf.default"
 
+CACHE="/var/cache/container-tools/${MODE}"
+SYSTEM="${MACHINES}/${NAME}"
+
 ## Generic parts
 if [ ! -e "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" ]
 then
-- 
cgit v1.2.3