From bbe0cde2bd2845cd6226d9e3c0d9182b97c1b359 Mon Sep 17 00:00:00 2001
From: Mark Elvers <mark.elvers@tunbury.org>
Date: Fri, 15 Mar 2024 22:36:12 +0000
Subject: [PATCH] Updated to FreeBSD 14

---
 playbook.yml                    | 3 ++-
 roles/base-image/files/jail     | 2 +-
 roles/base-image/tasks/main.yml | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/playbook.yml b/playbook.yml
index c3c0649..158c9d8 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -7,6 +7,7 @@
     - ocluster
     - docker
     - { role: base-image, version: "busybox", user_name: opam, zfs_pool: "obuilder", default: false }
-    - { role: base-image, version: "4.14.1", user_name: opam, zfs_pool: "obuilder" , default: false }
+    - { role: base-image, version: "4.14.2", user_name: opam, zfs_pool: "obuilder" , default: false }
+    - { role: base-image, version: "5.0.0", user_name: opam, zfs_pool: "obuilder" , default: false }
     - { role: base-image, version: "5.1.1", user_name: opam, zfs_pool: "obuilder" , default: true }
 
diff --git a/roles/base-image/files/jail b/roles/base-image/files/jail
index 189a327..af9158a 100644
--- a/roles/base-image/files/jail
+++ b/roles/base-image/files/jail
@@ -54,7 +54,7 @@ mkdir -p $1 || error "mkdir failed for $1"
 test ! -d $BSDINSTALL_DISTDIR && mkdir -p $BSDINSTALL_DISTDIR
 
 if [ ! -f $BSDINSTALL_DISTDIR/MANIFEST -a -z "$BSDINSTALL_DISTSITE" ]; then
-	export BSDINSTALL_DISTSITE="https://download.freebsd.org/ftp/releases/amd64/amd64/13.2-RELEASE"
+	export BSDINSTALL_DISTSITE="https://download.freebsd.org/ftp/releases/amd64/amd64/14.0-RELEASE"
 	fetch -o $BSDINSTALL_DISTDIR/MANIFEST $BSDINSTALL_DISTSITE/MANIFEST || error "Could not download $BSDINSTALL_DISTSITE/MANIFEST"
 fi
 
diff --git a/roles/base-image/tasks/main.yml b/roles/base-image/tasks/main.yml
index 7e090ea..ddf32db 100644
--- a/roles/base-image/tasks/main.yml
+++ b/roles/base-image/tasks/main.yml
@@ -56,11 +56,11 @@
 
 - name: Create setup script
   copy:
-    dest: "/{{ zfs_pool }}/base-image/{{ base_image }}/rootfs/usr/home/{{ user_name }}/freebsd-ocaml.sh"
+    dest: "/{{ zfs_pool }}/base-image/{{ base_image }}/rootfs/home/{{ user_name }}/freebsd-ocaml.sh"
     mode: u+rwx,g+rx,o+rx
     content: |
       #!/bin/sh
-      cd /usr/home/opam
+      cd /home/opam
       touch .hushlogin
       sed -i "" 's/^[^#]*fortune/# &/' .profile .login
       echo "OPAMCONFIRMLEVEL=unsafe-yes; export OPAMCONFIRMLEVEL" >> .profile
@@ -72,7 +72,7 @@
   when: version != "busybox"
 
 - name: Run freebsd-ocaml.sh script in jail /{{ zfs_pool }}/base-image/{{ base_image }}/rootfs as user {{ user_name }} for {{ version }}
-  shell: jail -c name=base-image path=/{{ zfs_pool }}/base-image/{{ base_image }}/rootfs host=inherit ip6=inherit ip4=inherit mount.devfs exec.jail_user=opam command=/usr/home/opam/freebsd-ocaml.sh
+  shell: jail -c name=base-image path=/{{ zfs_pool }}/base-image/{{ base_image }}/rootfs host=inherit ip6=inherit ip4=inherit mount.devfs exec.jail_user=opam command=/home/opam/freebsd-ocaml.sh
   when: version != "busybox"
 
 - name: Unmount devfs