From 84556253f6b8bb77bbb68e43d67b4c5ed080d4fb Mon Sep 17 00:00:00 2001 From: tschettervictor <85497460+tschettervictor@users.noreply.github.com> Date: Wed, 19 Nov 2025 23:38:10 -0700 Subject: [PATCH] bootstrap: suppress if directory exists but not dataset --- usr/local/share/bastille/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh index af3991bb..2eb77176 100644 --- a/usr/local/share/bastille/bootstrap.sh +++ b/usr/local/share/bastille/bootstrap.sh @@ -105,7 +105,7 @@ bootstrap_directories() { chmod 0750 "${bastille_prefix}" # Make sure the dataset is mounted in the proper place elif [ -d "${bastille_prefix}" ] && checkyesno bastille_zfs_enable; then - if ! zfs list "${bastille_zfs_zpool}/${bastille_zfs_prefix}" >/dev/null; then + if ! zfs list "${bastille_zfs_zpool}/${bastille_zfs_prefix}" >/dev/null 2>&1; then zfs create ${bastille_zfs_options} -o mountpoint="${bastille_prefix_mountpoint}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}" elif [ "$(zfs get -H -o value mountpoint ${bastille_zfs_zpool}/${bastille_zfs_prefix})" != "${bastille_prefix}" ]; then zfs set mountpoint="${bastille_prefix_mountpoint}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}"