summaryrefslogtreecommitdiffstats
path: root/share/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2016-07-01 09:53:17 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2016-07-01 09:53:17 +0000
commita18674d73d1ef3472897c0f2049bf8131b9e4eb6 (patch)
tree0910f1df6e4648f6866cc06910314b845bf99bf1 /share/scripts
parentAdding upstream version 20160615. (diff)
downloadopen-infrastructure-compute-tools-a18674d73d1ef3472897c0f2049bf8131b9e4eb6.tar.xz
open-infrastructure-compute-tools-a18674d73d1ef3472897c0f2049bf8131b9e4eb6.zip
Adding upstream version 20160701.upstream/20160701
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'share/scripts')
-rwxr-xr-xshare/scripts/debconf1
-rwxr-xr-xshare/scripts/debconf.d/0003-debconf14
-rwxr-xr-xshare/scripts/debootstrap2
3 files changed, 11 insertions, 6 deletions
diff --git a/share/scripts/debconf b/share/scripts/debconf
index c08444a..aa1c798 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -990,6 +990,7 @@ Upgrade_system "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" || echo "W: If upgradi
Cleanup_system "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}"
## Specific parts
+mkdir -p "${MACHINES}"
cp -a "${CACHE}/${DISTRIBUTION}_${ARCHITECTURE}" "${MACHINES}/${NAME}"
# Mounting bind mounts
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index 05c9eb5..15a6a15 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -1045,14 +1045,16 @@ Internal_options ()
if db_get cnt-debconf/auto
then
CNT_AUTO="${RET:-FQDN}" # string (w/o empty)
-
- case "${CNT_AUTO}" in
- FQDN)
- CNT_AUTO="$(hostname -f)"
- ;;
- esac
fi
+ CNT_AUTO="${CNT_AUTO:-FQDN}"
+
+ case "${CNT_AUTO}" in
+ FQDN)
+ CNT_AUTO="$(hostname -f)"
+ ;;
+ esac
+
echo "CNT_AUTO=\"${CNT_AUTO}\"" >> "${DEBCONF_TMPDIR}/debconf.default"
if db_get cnt-debconf/bind
diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap
index 0a9e733..de9e501 100755
--- a/share/scripts/debootstrap
+++ b/share/scripts/debootstrap
@@ -129,6 +129,8 @@ DISTRIBUTION="${DISTRIBUTION:-jessie}"
MIRROR="${MIRROR:-http://ftp.debian.org/debian}"
PASSWORD="${PASSWORD:-$(dd if=/dev/urandom bs=12 count=1 2> /dev/null | base64)}"
+mkdir -p "${MACHINES}"
+
debootstrap --arch=${ARCHITECTURE} --include=dbus ${DISTRIBUTION} ${MACHINES}/${NAME} ${MIRROR}
chroot "${MACHINES}/${NAME}" apt-get clean