From 2b715244381a2958859434f689ed82ea9e2c30d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rn=20=C3=85ne=20de=20Jong?= Date: Wed, 25 May 2022 11:04:46 +0200 Subject: [PATCH] Bump clsetup and rename to cloudsetup --- .../freebsd-build-opennebula-image.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/opennebula-images/freebsd-build-opennebula-image.sh b/opennebula-images/freebsd-build-opennebula-image.sh index 5899a6a..3d0add4 100755 --- a/opennebula-images/freebsd-build-opennebula-image.sh +++ b/opennebula-images/freebsd-build-opennebula-image.sh @@ -16,14 +16,14 @@ IMAGE_PATH_UFS=freebsd-ufs-$RELEASE-$(date -I).img.qcow2 IMAGE_SIZE=10G DIST_BASE="https://download.freebsd.org/ftp/releases/$ARCH/$RELEASE" -CLSETUP_COMMIT=82d7d16ff14e1893f06f39788bb7cd8604284583 -CLSETUP_URL="https://git.sr.ht/~jornane/clsetup/archive/$CLSETUP_COMMIT.tar.gz" +CLOUDSETUP_COMMIT=4ac15b8647d5525048c5faa5fd4b28491905d000 +CLOUDSETUP_URL="https://git.sr.ht/~jornane/cloudsetup/archive/$CLOUDSETUP_COMMIT.tar.gz" ZPOOL=zroot ZPOOL_TMP="zinstalling" ZFSTARGET="$(mktemp -d /var/tmp/zfsbuild.XXXXX)" UFSTARGET="$(mktemp -d /var/tmp/ufsbuild.XXXXX)" -CLSETUP_WORK="$(mktemp -d /var/tmp/clsetup.XXXXX)" +CLOUDSETUP_WORK="$(mktemp -d /var/tmp/cloudsetup.XXXXX)" if zpool list -Ho name $ZPOOL_TMP 2>/dev/null; then echo "The pool $ZPOOL_TMP is already imported." >&2 @@ -39,7 +39,7 @@ cleanup() { zpool export $ZPOOL_TMP ||: mdconfig -du md0 ||: mdconfig -du md1 ||: - rm -rf "$CLSETUP_WORK" + rm -rf "$CLOUDSETUP_WORK" } trap cleanup EXIT @@ -57,7 +57,7 @@ then env ASSUME_ALWAYS_YES=YES pkg install -y qemu-tools fi -fetch -qo- "$CLSETUP_URL" | tar -C "$CLSETUP_WORK" --strip-components 1 -xzf- +fetch -qo- "$CLOUDSETUP_URL" | tar -C "$CLOUDSETUP_WORK" --strip-components 1 -xzf- ufsdisk=$(mktemp /var/tmp/ufsdisk.XXXXX) truncate -s 6G $ufsdisk @@ -128,7 +128,7 @@ mount_nullfs /tmp "$UFSTARGET/tmp" mount_nullfs /var/tmp "$UFSTARGET/var/tmp" # Install the first-boot script that configures the network and ssh key -make -C "$CLSETUP_WORK/" PREFIX="$UFSTARGET/usr/local" install +make -C "$CLOUDSETUP_WORK/" PREFIX="$UFSTARGET/usr/local" install # Configure new system. printf '# Device\tMountpoint\tFStype\tOptions\t\tDump\tPass#\n' >"$UFSTARGET/etc/fstab" @@ -142,9 +142,9 @@ sysrc -f "$UFSTARGET/etc/rc.conf" \ sshd_enable=YES \ growfs_enable=YES \ hostname=freebsd \ - firstboot_clsetup_enable=YES \ + firstboot_cloudsetup_enable=YES \ -# The resolv.conf file is written by firstboot_clsetup +# The resolv.conf file is written by firstboot_cloudsetup #cp /etc/resolv.conf "$UFSTARGET/etc/resolv.conf" tzsetup -s -C "$UFSTARGET" UTC