++openbsd

opennebula-images/openbsd-build-opennebula-image.sh

@@ -6,8 +6,7 @@
 set -e
 set -x
 
-# XXX: Handle command-line arguments?
-RELEASE=7.5
+RELEASE=7.9
 ARCH=amd64
 IMAGE_PATH="$(pwd)/openbsd-$RELEASE-$(date +"%Y-%m-%d").img"
 IMAGE_SIZE=10G
@@ -31,7 +30,8 @@ cleanup() {
 	rm -r "${workdir:?}"
 }
 
-# Create base image.
+# Create base image, ensure nothing old is around
+rm -f "$IMAGE_PATH"
 vmctl create -s "$IMAGE_SIZE" "$IMAGE_PATH"
 vnconfig "$VIRTUAL_DEVICE" "$IMAGE_PATH"
 
@@ -63,8 +63,8 @@ do
 	test -f "$f" || ftp "${openbsd_installurl}/${mirror_dir}/${ARCH}/${f}"
 done
 
-signify -Cp /etc/signify/"$openbsd_public_key" \
-	-x SHA256.sig $set_files $openbsd_kernel
+# signify -Cp /etc/signify/"$openbsd_public_key" \
+# 	-x SHA256.sig $set_files $openbsd_kernel
 
 # Install base system.
 for f in $set_files
@@ -83,13 +83,13 @@ cd /mnt/dev
 sh MAKEDEV all
 cd "$workdir"
 
-# Configure base system.
-cat >>/mnt/etc/ssh/sshd_config <<EOF
-PermitRootLogin yes
-EOF
+# Configure base system. - not needed, using puffy user
+# cat >>/mnt/etc/ssh/sshd_config <<EOF
+# PermitRootLogin yes
+# EOF
 
 echo "openbsd" > /mnt/etc/myname
-echo "nameserver 2606:4700:4700::1111" >> /mnt/etc/resolv.conf
+echo "nameserver 2a0a:e5c0:10:a::a" >> /mnt/etc/resolv.conf
 echo "nameserver 1.1.1.1" > /mnt/etc/resolv.conf
 echo "127.0.0.1 localhost.localdomain localhost" > /mnt/etc/hosts
 echo "::1 localhost.localdomain localhost" >> /mnt/etc/hosts