From: Kristof Provost <kp@FreeBSD.org>
Date: Wed, 26 Feb 2025 20:14:23 +0000 (+0100)
Subject: image: switch to ZFS
X-Git-Url: https://git.sigsegv.be/?a=commitdiff_plain;h=4afe0ae16c5be8a4c2f865d5989e791394fad135;p=pennestraat-domotica

image: switch to ZFS

Both because ZFS, but also because of worries over file system checks on unclean
shutdown.
---

diff --git a/image/build.sh b/image/build.sh
index 7d7391e..9d6a452 100755
--- a/image/build.sh
+++ b/image/build.sh
@@ -14,7 +14,7 @@ poudriere image \
 	-b \
 	-c overlay/domotica \
 	-n domotica \
-	-s 6g -t usb
+	-s 6g -t zfs+gpt
 
 # Put the domotica image in the installer overlay
 xz -v -z -c \
diff --git a/image/overlay/domotica/etc/rc.d/ansibleprep b/image/overlay/domotica/etc/rc.d/ansibleprep
index e778aba..48b7dde 100755
--- a/image/overlay/domotica/etc/rc.d/ansibleprep
+++ b/image/overlay/domotica/etc/rc.d/ansibleprep
@@ -12,6 +12,11 @@ start_cmd="ansibleprep_start"
 
 ansibleprep_start()
 {
+	# Work around /tmp not having the correct permissions on the ZFS image
+	# Just set them here.
+	chmod 777 /tmp
+	chmod +t /tmp
+
 	# Only do this until we've set the hostname, which we use as a proxy for
 	# 'initial config done, reverse ssh tunnel ready'
 	# We do do a daily poll, so worst case it'll eventually work out.