From 9266f02268a1a91d5cd1b3154f7ac8b5e8354cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rn=20=C3=85ne=20de=20Jong?= Date: Sat, 11 Jun 2022 22:00:10 +0200 Subject: [PATCH] cloudsetup 1.2 is now in ports, no need to override anymore --- opennebula-images/freebsd-build-opennebula-image.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opennebula-images/freebsd-build-opennebula-image.sh b/opennebula-images/freebsd-build-opennebula-image.sh index cca57a7..b77e68c 100755 --- a/opennebula-images/freebsd-build-opennebula-image.sh +++ b/opennebula-images/freebsd-build-opennebula-image.sh @@ -17,7 +17,7 @@ IMAGE_SIZE=10G # Comment out to simply use latest version # Hash checking is disabled when specifying this -CLOUDSETUP_VERSION=1.2 +#CLOUDSETUP_VERSION=1.2 DIST_BASE="https://download.freebsd.org/ftp/releases/$ARCH/$RELEASE" ZPOOL=zroot @@ -71,7 +71,6 @@ fi if [ -n "$CLOUDSETUP_VERSION" ] then sed -i .bak -e '/^PORTVERSION=/ s/[0-9]*\.[0-9]*/'"$CLOUDSETUP_VERSION/" /usr/ports/sysutils/firstboot-cloudsetup/Makefile - echo '%%DATADIR%%/userconf-getent.sh' >> /usr/ports/sysutils/firstboot-cloudsetup/pkg-plist make -C /usr/ports/sysutils/firstboot-cloudsetup makesum fi make -C /usr/ports/sysutils/firstboot-cloudsetup clean package