Mirrors/hackacad
2
0
Fork 0
mirror of https://github.com/hackacad/bastille.git synced 2026-05-19 21:55:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

list: properly list jail type

Browse Source 
@michael-o 

This is actually a better solution. It didn't cross my mind that we are actually setting IS_FREEBSD_JAIL and IS_LINUX_JAIL in the list command.

For now, if both are detected, it will set JAIL_TYPE to "hybrid" but if that is not agreeable, we can simply leave it at "thick".
This commit is contained in:
tschettervictor
2025-09-28 19:55:05 -04:00
committed by GitHub
parent dda16adf46
commit 5769c9c6fe
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
usr/local/share/bastille/list.sh
View File

@@ -156,21 +156,6 @@ get_jail_info() {
# Get JID value
JID="$(jls -j ${JAIL_NAME} jid 2>/dev/null)"
# Get jail type
if grep -qw "${bastille_jailsdir}/${JAIL_NAME}/root/.bastille" "${bastille_jailsdir}/${JAIL_NAME}/fstab"; then
JAIL_TYPE="thin"
elif [ "$(grep -c "^linprocfs" "${bastille_jailsdir}/${JAIL_NAME}/fstab" 2> /dev/null)" -gt 0 ]; then
JAIL_TYPE="linux"
elif checkyesno bastille_zfs_enable; then
if [ "$(zfs get -H -o value origin ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${JAIL_NAME}/root)" != "-" ]; then
JAIL_TYPE="clone"
else
JAIL_TYPE="thick"
fi
else
JAIL_TYPE="thick"
fi
# Get jail tags
JAIL_TAGS=""
if [ -f "${bastille_jailsdir}/${JAIL_NAME}/tags" ]; then
@@ -189,6 +174,23 @@ get_jail_info() {
if [ "$(grep -c "^linprocfs" "${bastille_jailsdir}/${JAIL_NAME}/fstab" 2> /dev/null)" -gt 0 ]; then IS_LINUX_JAIL=1; fi
IS_LINUX_JAIL=${IS_LINUX_JAIL:-0}
# Get jail type
if grep -qw "${bastille_jailsdir}/${JAIL_NAME}/root/.bastille" "${bastille_jailsdir}/${JAIL_NAME}/fstab"; then
JAIL_TYPE="thin"
elif [ "$(grep -c "^linprocfs" "${bastille_jailsdir}/${JAIL_NAME}/fstab" 2> /dev/null)" -gt 0 ] && [ "${IS_LINUX_JAIL}" -eq 1 ] && [ "${IS_FREEBSD_JAIL}" -eq 0 ]; then
JAIL_TYPE="linux"
elif [ "${IS_LINUX_JAIL}" -eq 1 ] && [ "${IS_FREEBSD_JAIL}" -eq 1 ]; then
JAIL_TYPE="hybrid"
elif checkyesno bastille_zfs_enable; then
if [ "$(zfs get -H -o value origin ${bastille_zfs_zpool}/${bastille_zfs_prefix}/jails/${JAIL_NAME}/root)" != "-" ]; then
JAIL_TYPE="clone"
else
JAIL_TYPE="thick"
fi
else
JAIL_TYPE="thick"
fi
# Gather variable that depend on jail being UP or DOWN
if [ "$(/usr/sbin/jls name | awk "/^${JAIL_NAME}$/")" ]; then