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

set _LAST_JAIL in common

Browse Source
This commit is contained in:
tschettervictor
2025-04-29 21:08:08 -06:00
parent c501c92845
commit 310258f4b4
17 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
usr/local/share/bastille/cmd.sh
View File

@@ -87,7 +87,6 @@ COUNT=0
RETURN=0 RETURN=0
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
@@ -119,7 +118,7 @@ for _jail in ${JAILS}; do
fi fi
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

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

@@ -208,8 +208,10 @@ set_target() {
TARGET="$(list_jail_priority "${TARGET}" | sort -k2 -nr | awk '{print $1}')" TARGET="$(list_jail_priority "${TARGET}" | sort -k2 -nr | awk '{print $1}')"
JAILS="$(list_jail_priority "${TARGET}" | sort -k2 -nr | awk '{print $1}')" JAILS="$(list_jail_priority "${TARGET}" | sort -k2 -nr | awk '{print $1}')"
fi fi
_LAST_JAIL="$(echo ${JAILS} | awk '{print $NF}')"
export TARGET export TARGET
export JAILS export JAILS
export _LAST_JAIL
fi fi
} }
@@ -236,8 +238,10 @@ set_target_single() {
fi fi
TARGET="${_TARGET}" TARGET="${_TARGET}"
JAILS="${_TARGET}" JAILS="${_TARGET}"
_LAST_JAIL="$(echo ${JAILS} | awk '{print $NF}')"
export TARGET export TARGET
export JAILS export JAILS
export _LAST_JAIL
} }
target_all_jails() { target_all_jails() {
@@ -253,7 +257,9 @@ target_all_jails() {
elif [ "${_order}" = "reverse" ]; then elif [ "${_order}" = "reverse" ]; then
JAILS="$(list_jail_priority "${JAILS}" | sort -k2 -nr | awk '{print $1}')" JAILS="$(list_jail_priority "${JAILS}" | sort -k2 -nr | awk '{print $1}')"
fi fi
_LAST_JAIL="$(echo ${JAILS} | awk '{print $NF}')"
export JAILS export JAILS
export _LAST_JAIL
} }
update_fstab() { update_fstab() {

3
usr/local/share/bastille/console.sh
View File

@@ -84,7 +84,6 @@ USER="${2}"
bastille_root_check bastille_root_check
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
validate_user() { validate_user() {
local _jail="${1}" local _jail="${1}"
@@ -136,6 +135,6 @@ for _jail in ${JAILS}; do
fi fi
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

3
usr/local/share/bastille/cp.sh
View File

@@ -85,7 +85,6 @@ JAIL_PATH="${3}"
bastille_root_check bastille_root_check
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
@@ -100,6 +99,6 @@ for _jail in ${JAILS}; do
fi fi
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

3
usr/local/share/bastille/destroy.sh
View File

@@ -112,7 +112,7 @@ destroy_jail() {
fi fi
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done
} }
@@ -302,7 +302,6 @@ case "${TARGET}" in
*) *)
## just destroy a jail ## just destroy a jail
set_target "${TARGET}" "reverse" set_target "${TARGET}" "reverse"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
destroy_jail "${JAILS}" destroy_jail "${JAILS}"
;; ;;
esac esac

3
usr/local/share/bastille/jcp.sh
View File

@@ -87,7 +87,6 @@ DEST_PATH="${4}"
bastille_root_check bastille_root_check
set_target_single "${SOURCE_TARGET}" && SOURCE_TARGET="${TARGET}" set_target_single "${SOURCE_TARGET}" && SOURCE_TARGET="${TARGET}"
set_target "${DEST_TARGET}" && DEST_TARGET="${JAILS}" set_target "${DEST_TARGET}" && DEST_TARGET="${JAILS}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
for _jail in ${DEST_TARGET}; do for _jail in ${DEST_TARGET}; do
@@ -106,7 +105,7 @@ for _jail in ${DEST_TARGET}; do
fi fi
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
fi fi
done done

3
usr/local/share/bastille/limits.sh
View File

@@ -99,7 +99,6 @@ fi
bastille_root_check bastille_root_check
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
@@ -191,6 +190,6 @@ for _jail in ${JAILS}; do
esac esac
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

3
usr/local/share/bastille/mount.sh
View File

@@ -90,7 +90,6 @@ fi
bastille_root_check bastille_root_check
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
# Assign variables # Assign variables
_hostpath_fstab=$(echo "${_fstab}" | awk '{print $1}') _hostpath_fstab=$(echo "${_fstab}" | awk '{print $1}')
@@ -201,6 +200,6 @@ for _jail in ${JAILS}; do
echo "Added: ${_fstab_entry}" echo "Added: ${_fstab_entry}"
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

3
usr/local/share/bastille/pkg.sh
View File

@@ -91,7 +91,6 @@ shift
bastille_root_check bastille_root_check
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
errors=0 errors=0
@@ -127,7 +126,7 @@ for _jail in ${JAILS}; do
fi fi
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

3
usr/local/share/bastille/service.sh
View File

@@ -84,7 +84,6 @@ shift
bastille_root_check bastille_root_check
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
@@ -101,6 +100,6 @@ for _jail in ${JAILS}; do
jexec -l "${_jail}" /usr/sbin/service "$@" jexec -l "${_jail}" /usr/sbin/service "$@"
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

3
usr/local/share/bastille/start.sh
View File

@@ -100,7 +100,6 @@ TARGET="${1}"
bastille_root_check bastille_root_check
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
@@ -190,6 +189,6 @@ for _jail in ${JAILS}; do
sleep "${DELAY_TIME}" sleep "${DELAY_TIME}"
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

3
usr/local/share/bastille/stop.sh
View File

@@ -83,7 +83,6 @@ TARGET="${1}"
bastille_root_check bastille_root_check
set_target "${TARGET}" "reverse" set_target "${TARGET}" "reverse"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
@@ -136,6 +135,6 @@ for _jail in ${JAILS}; do
fi fi
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

3
usr/local/share/bastille/sysrc.sh
View File

@@ -84,7 +84,6 @@ shift
bastille_root_check bastille_root_check
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
@@ -101,6 +100,6 @@ for _jail in ${JAILS}; do
jexec -l "${_jail}" /usr/sbin/sysrc "$@" jexec -l "${_jail}" /usr/sbin/sysrc "$@"
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

3
usr/local/share/bastille/tags.sh
View File

@@ -73,7 +73,6 @@ TAGS="${3}"
bastille_root_check bastille_root_check
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
@@ -121,7 +120,7 @@ for _jail in ${JAILS}; do
esac esac
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

3
usr/local/share/bastille/template.sh
View File

@@ -221,7 +221,6 @@ if [ "${TARGET}" = '--convert' ]; then
exit 0 exit 0
else else
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
fi fi
case ${TEMPLATE} in case ${TEMPLATE} in
@@ -472,7 +471,7 @@ for _jail in ${JAILS}; do
done done
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
info "Template applied: ${TEMPLATE}" info "Template applied: ${TEMPLATE}"

3
usr/local/share/bastille/umount.sh
View File

@@ -84,7 +84,6 @@ MOUNT_PATH="${2}"
bastille_root_check bastille_root_check
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
@@ -128,6 +127,6 @@ for _jail in ${JAILS}; do
echo "Unmounted: ${_jailpath}" echo "Unmounted: ${_jailpath}"
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done

11
usr/local/share/bastille/zfs.sh
View File

@@ -53,7 +53,7 @@ for _jail in ${JAILS}; do
zfs snapshot -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"@"${TAG}" zfs snapshot -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"@"${TAG}"
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done
} }
@@ -68,7 +68,7 @@ for _jail in ${JAILS}; do
zfs destroy -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"@"${TAG}" zfs destroy -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"@"${TAG}"
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done
} }
@@ -82,7 +82,7 @@ for _jail in ${JAILS}; do
zfs "${ATTRIBUTE}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}" zfs "${ATTRIBUTE}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done
} }
@@ -95,7 +95,7 @@ for _jail in ${JAILS}; do
zfs get "${ATTRIBUTE}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}" zfs get "${ATTRIBUTE}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done
} }
@@ -109,7 +109,7 @@ for _jail in ${JAILS}; do
zfs list -t all -o name,used,avail,refer,mountpoint,compress,ratio -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}" zfs list -t all -o name,used,avail,refer,mountpoint,compress,ratio -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"
# Print blank line on last jail # Print blank line on last jail
[ "${_jail}" = "${_last_jail}" ] && echo "" [ "${_jail}" = "${_LAST_JAIL}" ] && echo ""
done done
} }
@@ -144,7 +144,6 @@ ACTION="${2}"
bastille_root_check bastille_root_check
set_target "${TARGET}" set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
# Check if ZFS is enabled # Check if ZFS is enabled
if ! checkyesno bastille_zfs_enable; then if ! checkyesno bastille_zfs_enable; then