BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Merge pull request #466 from yaazkal/ref_bootstrap

Browse Source 
[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
parent 4c4edc07c5 1c5d343171
commit bbe44f79c6
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
usr/local/share/bastille/bootstrap.sh
View File

@@ -103,12 +103,11 @@ bootstrap_directories() {
if [ "${bastille_zfs_enable}" = "YES" ];then if [ "${bastille_zfs_enable}" = "YES" ];then
if [ -n "${bastille_zfs_zpool}" ]; then if [ -n "${bastille_zfs_zpool}" ]; then
zfs create ${bastille_zfs_options} -o mountpoint="${bastille_prefix}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}" zfs create ${bastille_zfs_options} -o mountpoint="${bastille_prefix}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}"
chmod 0750 "${bastille_prefix}"
fi fi
else else
mkdir -p "${bastille_prefix}" mkdir -p "${bastille_prefix}"
chmod 0750 "${bastille_prefix}"
fi fi
chmod 0750 "${bastille_prefix}"
fi fi
## ${bastille_backupsdir} ## ${bastille_backupsdir}
@@ -116,12 +115,11 @@ bootstrap_directories() {
if [ "${bastille_zfs_enable}" = "YES" ];then if [ "${bastille_zfs_enable}" = "YES" ];then
if [ -n "${bastille_zfs_zpool}" ]; then if [ -n "${bastille_zfs_zpool}" ]; then
zfs create ${bastille_zfs_options} -o mountpoint="${bastille_backupsdir}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/backups" zfs create ${bastille_zfs_options} -o mountpoint="${bastille_backupsdir}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/backups"
chmod 0750 "${bastille_backupsdir}"
fi fi
else else
mkdir -p "${bastille_backupsdir}" mkdir -p "${bastille_backupsdir}"
chmod 0750 "${bastille_backupsdir}"
fi fi
chmod 0750 "${bastille_backupsdir}"
fi fi
## ${bastille_cachedir} ## ${bastille_cachedir}