From ac96e8b6ece9ea75fc1b10f46d2e7dd14b926600 Mon Sep 17 00:00:00 2001 From: Sven R Date: Tue, 10 Mar 2020 17:14:18 +0100 Subject: [PATCH 1/4] bootstrap chmod --- usr/local/share/bastille/bootstrap.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh index c9fb8694..b7c7fc27 100644 --- a/usr/local/share/bastille/bootstrap.sh +++ b/usr/local/share/bastille/bootstrap.sh @@ -181,6 +181,7 @@ bootstrap_directories() { if [ "${bastille_zfs_enable}" = "YES" ];then if [ ! -z "${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}" @@ -193,6 +194,7 @@ bootstrap_directories() { if [ "${bastille_zfs_enable}" = "YES" ];then if [ ! -z "${bastille_zfs_zpool}" ]; then zfs create ${bastille_zfs_options} -o mountpoint=${bastille_backupsdir} ${bastille_zfs_zpool}/${bastille_zfs_prefix}/backups + chmod 0750 "${bastille_backupsdir}" fi else mkdir -p "${bastille_backupsdir}" From 102fbc7d517ffffcb9911d44360b4be279cf3404 Mon Sep 17 00:00:00 2001 From: Sven R Date: Tue, 10 Mar 2020 17:15:46 +0100 Subject: [PATCH 2/4] bootstrap chmod --- usr/local/share/bastille/bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/local/share/bastille/bootstrap.sh b/usr/local/share/bastille/bootstrap.sh index b7c7fc27..cb1fd3be 100644 --- a/usr/local/share/bastille/bootstrap.sh +++ b/usr/local/share/bastille/bootstrap.sh @@ -181,7 +181,7 @@ bootstrap_directories() { if [ "${bastille_zfs_enable}" = "YES" ];then if [ ! -z "${bastille_zfs_zpool}" ]; then zfs create ${bastille_zfs_options} -o mountpoint=${bastille_prefix} ${bastille_zfs_zpool}/${bastille_zfs_prefix} - chmod 0750 "${bastille_prefix}" + chmod 0750 "${bastille_prefix}" fi else mkdir -p "${bastille_prefix}" @@ -194,7 +194,7 @@ bootstrap_directories() { if [ "${bastille_zfs_enable}" = "YES" ];then if [ ! -z "${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_backupsdir}" fi else mkdir -p "${bastille_backupsdir}" From 2240211f6a21b5eca6f04b56a08fea5b602cd453 Mon Sep 17 00:00:00 2001 From: Bike Dude Date: Tue, 10 Mar 2020 20:46:09 +0100 Subject: [PATCH 3/4] 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}" From 512f97395088b2907e19dd8faf0e493b11c5d364 Mon Sep 17 00:00:00 2001 From: Bike Dude Date: Tue, 10 Mar 2020 20:47:33 +0100 Subject: [PATCH 4/4] chmod issue fixed --- 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 c53eac36..6dcdf862 100644 --- a/usr/local/share/bastille/bootstrap.sh +++ b/usr/local/share/bastille/bootstrap.sh @@ -195,7 +195,7 @@ bootstrap_directories() { 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_prefix}" + chmod 0750 "${bastille_backupsdir}" fi else mkdir -p "${bastille_backupsdir}"