From 6ef1a7c2085ec5d8feff3533dfa94e182e7f26a1 Mon Sep 17 00:00:00 2001 From: msoudny <164319180+msoudny@users.noreply.github.com> Date: Tue, 5 Nov 2024 09:50:24 +0100 Subject: [PATCH] Update bastille.conf.sample removed $bastille_zfs_zpool from bastille zfs_prefix as it's called as $bastille_zfs_zpool/$bastille_zfs_prefix in bootstrap.sh, clone.sh, create.sh, destroy.sh, export.sh, import.sh, rename.sh, zfs.sh and causes duplicate zpool name which leads to errors. --- usr/local/etc/bastille/bastille.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/etc/bastille/bastille.conf.sample b/usr/local/etc/bastille/bastille.conf.sample index 2d3d207b..88ed5111 100644 --- a/usr/local/etc/bastille/bastille.conf.sample +++ b/usr/local/etc/bastille/bastille.conf.sample @@ -41,7 +41,7 @@ bastille_url_midnightbsd="https://www.midnightbsd.org/ftp/MidnightBSD/releases/" ## ZFS options bastille_zfs_enable="" ## default: "" bastille_zfs_zpool="" ## default: "" -bastille_zfs_prefix="${bastille_zfs_zpool}/bastille" ## default: "${bastille_zfs_zpool}/bastille" +bastille_zfs_prefix="bastille" ## default: "bastille" bastille_zfs_options="-o compress=lz4 -o atime=off" ## default: "-o compress=lz4 -o atime=off" ## Export/Import options