diff options
Diffstat (limited to 'share/scripts')
-rwxr-xr-x | share/scripts/debconf | 1 | ||||
-rwxr-xr-x | share/scripts/debconf.d/0003-debconf | 14 | ||||
-rwxr-xr-x | share/scripts/debootstrap | 2 |
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 |