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

[REF] clean code for PR#650

Browse Source
This commit is contained in:
yaazkal
2024-07-13 17:29:30 -05:00
parent b7b2efca12
commit 09dcdd0ec7
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,11 +212,6 @@ bootstrap_directories() {
} }
bootstrap_release() { 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 release exists quit, else bootstrap additional distfiles
if [ -f "${bastille_releasesdir}/${RELEASE}/COPYRIGHT" ]; then if [ -f "${bastille_releasesdir}/${RELEASE}/COPYRIGHT" ]; then
## check distfiles list and skip existing cached files ## check distfiles list and skip existing cached files

4
usr/local/share/bastille/setup.sh
View File

@@ -112,10 +112,6 @@ configure_zfs() {
else else
## attempt to determine bastille_zroot from `zpool list` ## attempt to determine bastille_zroot from `zpool list`
bastille_zroot=$(zpool list | grep -v NAME | awk '{print $1}') 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_enable=YES
sysrc -f "${bastille_config}" bastille_zfs_zpool="${bastille_zroot}" sysrc -f "${bastille_config}" bastille_zfs_zpool="${bastille_zroot}"
fi fi