Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2025-12-18 16:21:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix shellcheck

Browse Source
This commit is contained in:
tschettervictor
2025-05-17 19:04:47 -06:00
committed by GitHub
parent b829a7ea68
commit 57e6ab40da
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
usr/local/share/bastille/common.sh
View File

@@ -301,17 +301,24 @@ set_zfs_mountpoints() {
# We have to do this if ALTROOT is enabled/present # We have to do this if ALTROOT is enabled/present
local _altroot="$(zpool get -Ho value altroot ${bastille_zfs_zpool})" local _altroot="$(zpool get -Ho value altroot ${bastille_zfs_zpool})"
# Set mountpoints to *bastille*dir*
# shellcheck disable=SC2034
bastille_prefix_mountpoint="${bastille_prefix}"
# shellcheck disable=SC2034
bastille_backupsdir_mountpoint="${bastille_backupsdir}"
# shellcheck disable=SC2034
bastille_cachedir_mountpoint="${bastille_cachedir}"
# shellcheck disable=SC2034
bastille_jailsdir_mountpoint="${bastille_jailsdir}"
# shellcheck disable=SC2034
bastille_releasesdir_mountpoint="${bastille_releasesdir}"
# shellcheck disable=SC2034
bastille_templatesdir_mountpoint="${bastille_templatesdir}"
# shellcheck disable=SC2034
bastille_logsdir_mountpoint="${bastille_logsdir}"
# Add _altroot to *dir* if set
if [ "${_altroot}" != "-" ]; then if [ "${_altroot}" != "-" ]; then
# Set mountpoints to *dir*
bastille_prefix_mountpoint="${bastille_prefix}"
bastille_backupsdir_mountpoint="${bastille_backupsdir}"
bastille_cachedir_mountpoint="${bastille_cachedir}"
bastille_jailsdir_mountpoint="${bastille_jailsdir}"
bastille_releasesdir_mountpoint="${bastille_releasesdir}"
bastille_templatesdir_mountpoint="${bastille_templatesdir}"
bastille_logsdir_mountpoint="${bastille_logsdir}"
# Set *dir* to include ALTROOT # Set *dir* to include ALTROOT
bastille_prefix="${_altroot}${bastille_prefix}" bastille_prefix="${_altroot}${bastille_prefix}"
bastille_backupsdir="${_altroot}${bastille_backupsdir}" bastille_backupsdir="${_altroot}${bastille_backupsdir}"
@@ -320,7 +327,6 @@ set_zfs_mountpoints() {
bastille_releasesdir="${_altroot}${bastille_releasesdir}" bastille_releasesdir="${_altroot}${bastille_releasesdir}"
bastille_templatesdir="${_altroot}${bastille_templatesdir}" bastille_templatesdir="${_altroot}${bastille_templatesdir}"
bastille_logsdir="${_altroot}${bastille_logsdir}" bastille_logsdir="${_altroot}${bastille_logsdir}"
fi fi
} }
set_zfs_mountpoints set_zfs_mountpoints