Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2026-01-05 20:24:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

only set _last_jail once

Browse Source
This commit is contained in:
tschettervictor
2025-04-29 20:53:27 -06:00
parent feaf8c792b
commit 7974eb7429
16 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -53,7 +53,6 @@ for _jail in ${JAILS}; do
zfs snapshot -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"@"${TAG}"
# Print blank line on last jail
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
[ "${_jail}" = "${_last_jail}" ] && echo ""
done
@@ -69,7 +68,6 @@ for _jail in ${JAILS}; do
zfs destroy -r "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"@"${TAG}"
# Print blank line on last jail
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
[ "${_jail}" = "${_last_jail}" ] && echo ""
done
@@ -84,7 +82,6 @@ for _jail in ${JAILS}; do
zfs "${ATTRIBUTE}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"
# Print blank line on last jail
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
[ "${_jail}" = "${_last_jail}" ] && echo ""
done
@@ -98,7 +95,6 @@ for _jail in ${JAILS}; do
zfs get "${ATTRIBUTE}" "${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${_jail}"
# Print blank line on last jail
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
[ "${_jail}" = "${_last_jail}" ] && echo ""
done
@@ -113,7 +109,6 @@ 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}"
# Print blank line on last jail
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
[ "${_jail}" = "${_last_jail}" ] && echo ""
done
@@ -149,6 +144,7 @@ ACTION="${2}"
bastille_root_check
set_target "${TARGET}"
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
# Check if ZFS is enabled
if ! checkyesno bastille_zfs_enable; then