From 2240211f6a21b5eca6f04b56a08fea5b602cd453 Mon Sep 17 00:00:00 2001
From: Bike Dude <admin@netzmacher.net>
Date: Tue, 10 Mar 2020 20:46:09 +0100
Subject: [PATCH] fix merge conflict

---
 usr/local/share/bastille/bootstrap.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh
index 32065141..c53eac36 100644
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.sh
@@ -183,7 +183,6 @@ bootstrap_directories() {
             if [ -n "${bastille_zfs_zpool}" ]; then
                 zfs create ${bastille_zfs_options} -o mountpoint="${bastille_prefix}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}"
                 chmod 0750 "${bastille_prefix}"
-
             fi
         else
             mkdir -p "${bastille_prefix}"
@@ -194,10 +193,9 @@ bootstrap_directories() {
     ## ${bastille_backupsdir}
     if [ ! -d "${bastille_backupsdir}" ]; then
         if [ "${bastille_zfs_enable}" = "YES" ];then
-
             if [ -n "${bastille_zfs_zpool}" ]; then
                 zfs create ${bastille_zfs_options} -o mountpoint="${bastille_backupsdir}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/backups"
-                chmod 0750 "${bastille_backupsdir}"
+                chmod 0750 "${bastille_prefix}"
             fi
         else
             mkdir -p "${bastille_backupsdir}"