summaryrefslogtreecommitdiffstats
path: root/share/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-07-24 18:45:00 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-07-24 18:55:37 +0000
commitd20677330a40013f3b371fa0734de9ad7a069235 (patch)
treef4b1e2d7e40490a45c45e762048c16b8a615386d /share/scripts
parentAdding upstream version 20210630. (diff)
downloadopen-infrastructure-compute-tools-d20677330a40013f3b371fa0734de9ad7a069235.tar.xz
open-infrastructure-compute-tools-d20677330a40013f3b371fa0734de9ad7a069235.zip
Adding upstream version 20210724.upstream/20210724
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/scripts')
-rwxr-xr-xshare/scripts/debconf8
-rwxr-xr-xshare/scripts/debootstrap4
2 files changed, 9 insertions, 3 deletions
diff --git a/share/scripts/debconf b/share/scripts/debconf
index 9a703e5..86c871f 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -602,10 +602,14 @@ EOF
IPV4_ADDRESS1_PART4="$(echo ${IPV4_ADDRESS1} | cut -d. -f4)"
IPV6_ADDRESS1="$(${DIG} AAAA +short ${NAME} | tail -n1)"
- # TODO: address parts
+ # FIXME: address parts
+
+ export IPV4_ADDRESS1 IPV4_ADDRESS1_PART1 IPV4_ADDRESS1_PART2 IPV4_ADDRESS1_PART3 IPV4_ADDRESS1_PART4
+ export IPV6_ADDRESS1
fi
- sed -e "s|@NAME@|${NAME}|g" \
+ sed -e "s|@FILE@|${FILE}|g" \
+ -e "s|@NAME@|${NAME}|g" \
-e "s|@IPV4_ADDRESS1@|${IPV4_ADDRESS1}|g" \
-e "s|@IPV4_ADDRESS1_PART1@|${IPV4_ADDRESS1_PART1}|g" \
-e "s|@IPV4_ADDRESS1_PART2@|${IPV4_ADDRESS1_PART2}|g" \
diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap
index f0db7e8..9f5b6eb 100755
--- a/share/scripts/debootstrap
+++ b/share/scripts/debootstrap
@@ -174,9 +174,11 @@ do
fi
done
+# Run
mkdir -p "${MACHINES}"
-
${BOOTSTRAP} ${BOOTSTRAP_OPTIONS} --arch=${ARCHITECTURE} --include=${INCLUDE} ${DISTRIBUTION} ${MACHINES}/${NAME} ${MIRROR}
+
+# Cleaning apt cache
chroot "${MACHINES}/${NAME}" apt clean
# Setting hostname