mirror of
https://github.com/hackacad/bastille.git
synced 2025-12-25 23:10:33 +01:00
[REF] clean code for PR#650
This commit is contained in:
@@ -212,11 +212,6 @@ bootstrap_directories() {
|
||||
}
|
||||
|
||||
bootstrap_release() {
|
||||
# Make sure to check/bootstrap directories first.¬
|
||||
NOCACHEDIR=1
|
||||
RELEASE="${DIR_BOOTSTRAP}"
|
||||
bootstrap_directories
|
||||
|
||||
## if release exists quit, else bootstrap additional distfiles
|
||||
if [ -f "${bastille_releasesdir}/${RELEASE}/COPYRIGHT" ]; then
|
||||
## check distfiles list and skip existing cached files
|
||||
|
||||
@@ -112,10 +112,6 @@ configure_zfs() {
|
||||
else
|
||||
## attempt to determine bastille_zroot from `zpool list`
|
||||
bastille_zroot=$(zpool list | grep -v NAME | awk '{print $1}')
|
||||
zfs create ${bastille_zfs_options} -o mountpoint=${bastille_prefix} ${bastille_zroot}/bastille || \
|
||||
error_exit "Failed to create zfs dataset 'bastille' in pool '${bastille_zroot}'"
|
||||
chown root:root ${bastille_prefix}
|
||||
chmod 0750 ${bastille_prefix}
|
||||
sysrc -f "${bastille_config}" bastille_zfs_enable=YES
|
||||
sysrc -f "${bastille_config}" bastille_zfs_zpool="${bastille_zroot}"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user