diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-07-24 18:45:13 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-07-24 18:55:55 +0000 |
| commit | f36095ed361afeaad2f44720ada816ec3bee7cb6 (patch) | |
| tree | f456942861d9aaa471e870573ce2c3932fb30c48 /share/scripts | |
| parent | Releasing progress-linux version 20210630-1. (diff) | |
| download | open-infrastructure-compute-tools-f36095ed361afeaad2f44720ada816ec3bee7cb6.tar.xz open-infrastructure-compute-tools-f36095ed361afeaad2f44720ada816ec3bee7cb6.zip | |
Merging upstream version 20210724.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/scripts')
| -rwxr-xr-x | share/scripts/debconf | 8 | ||||
| -rwxr-xr-x | share/scripts/debootstrap | 4 |
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 |