Mirrors/BastilleBSD_bastille
1
0
Fork 1
mirror of https://github.com/BastilleBSD/bastille.git synced 2025-12-12 10:00:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1251 from BastilleBSD/tschettervictor-patch-1

Browse Source
This commit is contained in:
tschettervictor
2025-09-30 12:07:23 -06:00
committed by GitHub
parent 0d92ec1990 b6014dacad
commit b1c4c32ebd
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,21 +156,6 @@ get_jail_info() {
# Get JID value # Get JID value
JID="$(jls -j ${JAIL_NAME} jid 2>/dev/null)" 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 # Get jail tags
JAIL_TAGS="" JAIL_TAGS=""
if [ -f "${bastille_jailsdir}/${JAIL_NAME}/tags" ]; then if [ -f "${bastille_jailsdir}/${JAIL_NAME}/tags" ]; then
@@ -186,9 +171,24 @@ get_jail_info() {
if [ -f "${bastille_jailsdir}/${JAIL_NAME}/root/bin/freebsd-version" ] || [ -f "${bastille_jailsdir}/${JAIL_NAME}/root/.bastille/bin/freebsd-version" ] || [ "$(grep -c "/releases/.*/root/.bastille.*nullfs" "${bastille_jailsdir}/${JAIL_NAME}/fstab" 2> /dev/null)" -gt 0 ]; then IS_FREEBSD_JAIL=1; fi if [ -f "${bastille_jailsdir}/${JAIL_NAME}/root/bin/freebsd-version" ] || [ -f "${bastille_jailsdir}/${JAIL_NAME}/root/.bastille/bin/freebsd-version" ] || [ "$(grep -c "/releases/.*/root/.bastille.*nullfs" "${bastille_jailsdir}/${JAIL_NAME}/fstab" 2> /dev/null)" -gt 0 ]; then IS_FREEBSD_JAIL=1; fi
IS_FREEBSD_JAIL=${IS_FREEBSD_JAIL:-0} IS_FREEBSD_JAIL=${IS_FREEBSD_JAIL:-0}
IS_LINUX_JAIL=0 IS_LINUX_JAIL=0
if [ "$(grep -c "^linprocfs" "${bastille_jailsdir}/${JAIL_NAME}/fstab" 2> /dev/null)" -gt 0 ]; then IS_LINUX_JAIL=1; fi if [ "$(grep -c "^linprocfs.*${bastille_jailsdir}/${JAIL_NAME}/proc.*linprocfs" "${bastille_jailsdir}/${JAIL_NAME}/fstab" 2> /dev/null)" -gt 0 ]; then IS_LINUX_JAIL=1; fi
IS_LINUX_JAIL=${IS_LINUX_JAIL:-0} 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 [ "${IS_LINUX_JAIL}" -eq 1 ] && [ "${IS_FREEBSD_JAIL}" -eq 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
# Gather variable that depend on jail being UP or DOWN # Gather variable that depend on jail being UP or DOWN
if [ "$(/usr/sbin/jls name | awk "/^${JAIL_NAME}$/")" ]; then if [ "$(/usr/sbin/jls name | awk "/^${JAIL_NAME}$/")" ]; then
@@ -222,8 +222,7 @@ get_jail_info() {
# Get release (FreeBSD or Linux) # Get release (FreeBSD or Linux)
if [ "${IS_FREEBSD_JAIL}" -eq 1 ]; then if [ "${IS_FREEBSD_JAIL}" -eq 1 ]; then
JAIL_RELEASE=$(jexec -l ${JAIL_NAME} freebsd-version -u 2> /dev/null) JAIL_RELEASE=$(jexec -l ${JAIL_NAME} freebsd-version -u 2> /dev/null)
fi elif [ "${IS_LINUX_JAIL}" -eq 1 ]; then
if [ "${IS_LINUX_JAIL}" -eq 1 ]; then
JAIL_RELEASE=$(grep -hE "^NAME=.*$|^VERSION_ID=.*$|^VERSION_CODENAME=.*$" "${JAIL_PATH}/etc/os-release" 2> /dev/null | sed "s/\"//g" | sed "s/ GNU\/Linux//g" | awk -F'=' '{ a[$1] = $2; o++ } o%3 == 0 { print a["VERSION_CODENAME"] " (" a["NAME"] " " a["VERSION_ID"] ")" }') JAIL_RELEASE=$(grep -hE "^NAME=.*$|^VERSION_ID=.*$|^VERSION_CODENAME=.*$" "${JAIL_PATH}/etc/os-release" 2> /dev/null | sed "s/\"//g" | sed "s/ GNU\/Linux//g" | awk -F'=' '{ a[$1] = $2; o++ } o%3 == 0 { print a["VERSION_CODENAME"] " (" a["NAME"] " " a["VERSION_ID"] ")" }')
fi fi