mirror of
https://github.com/hackacad/bastille.git
synced 2025-12-20 09:10:15 +01:00
print blank line after last jail
This commit is contained in:
@@ -116,6 +116,11 @@ for _jail in ${JAILS}; do
|
|||||||
else
|
else
|
||||||
RETURN=$(($RETURN+$ERROR_CODE))
|
RETURN=$(($RETURN+$ERROR_CODE))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
# Check when a command is executed in all running jails. (bastille cmd ALL ...)
|
# Check when a command is executed in all running jails. (bastille cmd ALL ...)
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ fi
|
|||||||
# Notify message on error, and continue to next jail
|
# Notify message on error, and continue to next jail
|
||||||
error_continue() {
|
error_continue() {
|
||||||
error_notify "$@"
|
error_notify "$@"
|
||||||
|
echo ""
|
||||||
# shellcheck disable=SC2104
|
# shellcheck disable=SC2104
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -133,5 +133,9 @@ for _jail in ${JAILS}; do
|
|||||||
LOGIN="$(jexec -l "${_jail}" which login)"
|
LOGIN="$(jexec -l "${_jail}" which login)"
|
||||||
${_setfib} jexec -l "${_jail}" $LOGIN -f root
|
${_setfib} jexec -l "${_jail}" $LOGIN -f root
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -98,4 +98,8 @@ for _jail in ${JAILS}; do
|
|||||||
error_continue "CP failed: ${host_path} -> ${jail_path}"
|
error_continue "CP failed: ${host_path} -> ${jail_path}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
@@ -110,6 +110,11 @@ destroy_jail() {
|
|||||||
pfctl -a "rdr/${_jail}" -Fn
|
pfctl -a "rdr/${_jail}" -Fn
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -103,5 +103,10 @@ for _jail in ${DEST_TARGET}; do
|
|||||||
if ! cp "${OPTION}" "${source_path}" "${dest_path}"; then
|
if ! cp "${OPTION}" "${source_path}" "${dest_path}"; then
|
||||||
error_continue "JCP failed: ${source_path} -> ${dest_path}"
|
error_continue "JCP failed: ${source_path} -> ${dest_path}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -188,4 +188,9 @@ for _jail in ${JAILS}; do
|
|||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -198,4 +198,9 @@ for _jail in ${JAILS}; do
|
|||||||
echo "${_fstab_entry}" >> "${bastille_jailsdir}/${_jail}/fstab" || error_continue "Failed to create fstab entry: ${_fstab_entry}"
|
echo "${_fstab_entry}" >> "${bastille_jailsdir}/${_jail}/fstab" || error_continue "Failed to create fstab entry: ${_fstab_entry}"
|
||||||
mount -F "${bastille_jailsdir}/${_jail}/fstab" -a || error_continue "Failed to mount volume: ${_fullpath}"
|
mount -F "${bastille_jailsdir}/${_jail}/fstab" -a || error_continue "Failed to mount volume: ${_fullpath}"
|
||||||
echo "Added: ${_fstab_entry}"
|
echo "Added: ${_fstab_entry}"
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -124,6 +124,11 @@ for _jail in ${JAILS}; do
|
|||||||
errors=1
|
errors=1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ $errors -ne 0 ]; then
|
if [ $errors -ne 0 ]; then
|
||||||
|
|||||||
@@ -99,4 +99,8 @@ for _jail in ${JAILS}; do
|
|||||||
|
|
||||||
jexec -l "${_jail}" /usr/sbin/service "$@"
|
jexec -l "${_jail}" /usr/sbin/service "$@"
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -187,5 +187,9 @@ for _jail in ${JAILS}; do
|
|||||||
|
|
||||||
# Delay between jail action
|
# Delay between jail action
|
||||||
sleep "${DELAY_TIME}"
|
sleep "${DELAY_TIME}"
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -133,5 +133,9 @@ for _jail in ${JAILS}; do
|
|||||||
pfctl -q -t "${bastille_network_pf_table}" -T delete "${_ip}"
|
pfctl -q -t "${bastille_network_pf_table}" -T delete "${_ip}"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -99,4 +99,8 @@ for _jail in ${JAILS}; do
|
|||||||
|
|
||||||
jexec -l "${_jail}" /usr/sbin/sysrc "$@"
|
jexec -l "${_jail}" /usr/sbin/sysrc "$@"
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -118,5 +118,10 @@ for _jail in ${JAILS}; do
|
|||||||
usage
|
usage
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
@@ -469,6 +469,11 @@ for _jail in ${JAILS}; do
|
|||||||
echo
|
echo
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
|
info "Template applied: ${TEMPLATE}"
|
||||||
|
|
||||||
info "Template applied: ${TEMPLATE}"
|
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -126,4 +126,8 @@ for _jail in ${JAILS}; do
|
|||||||
|
|
||||||
echo "Unmounted: ${_jailpath}"
|
echo "Unmounted: ${_jailpath}"
|
||||||
|
|
||||||
|
# Print blank line on last jail
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|||||||
@@ -52,6 +52,10 @@ for _jail in ${JAILS}; do
|
|||||||
# shellcheck disable=SC2140
|
# shellcheck disable=SC2140
|
||||||
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
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,6 +68,10 @@ for _jail in ${JAILS}; do
|
|||||||
# shellcheck disable=SC2140
|
# shellcheck disable=SC2140
|
||||||
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
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,6 +83,10 @@ 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
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,6 +97,10 @@ for _jail in ${JAILS}; do
|
|||||||
info "[${_jail}]:"
|
info "[${_jail}]:"
|
||||||
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
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,7 +111,11 @@ for _jail in ${JAILS}; do
|
|||||||
info "[${_jail}]:"
|
info "[${_jail}]:"
|
||||||
|
|
||||||
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
|
||||||
|
_last_jail="$(echo ${JAILS} | awk '{print $NF}')"
|
||||||
|
[ "${_jail}" = "${_last_jail}" ] && echo ""
|
||||||
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user