Merge pull request #466 from yaazkal/ref_bootstrap

[REF] bootsrap: Removes code duplication to prevent future errors
This commit is contained in:
Christer Edwards
2021-12-09 10:52:49 -07:00
committed by GitHub

View File

@@ -103,12 +103,11 @@ bootstrap_directories() {
if [ "${bastille_zfs_enable}" = "YES" ];then
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}"
chmod 0750 "${bastille_prefix}"
fi
chmod 0750 "${bastille_prefix}"
fi
## ${bastille_backupsdir}
@@ -116,12 +115,11 @@ 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_backupsdir}"
fi
else
mkdir -p "${bastille_backupsdir}"
chmod 0750 "${bastille_backupsdir}"
fi
chmod 0750 "${bastille_backupsdir}"
fi
## ${bastille_cachedir}