BastilleBSD/bastille
2
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Merge pull request #284 from chriswells0/stopped-jail-actions

Browse Source 
Fix bug preventing commands against stopped jails.
This commit is contained in:
Christer Edwards
2020-11-28 13:12:52 -07:00
committed by GitHub
parent ce57d05081 351020d137
commit b0c27329c9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
usr/local/bin/bastille
+1 -1
View File
@@ -155,7 +155,7 @@ clone|config|cmd|console|convert|cp|edit|export|htop|limits|mount|pkg|rename|ser
fi fi
done done
else else
JAILS=$(jls name | awk "/^${TARGET}$/") JAILS="${TARGET}"
# Ensure the target exists. -- cwells # Ensure the target exists. -- cwells
if [ ! -d "${bastille_jailsdir}/${TARGET}" ]; then if [ ! -d "${bastille_jailsdir}/${TARGET}" ]; then
usr/local/share/bastille/cp.sh
+1 -1
View File
@@ -50,8 +50,8 @@ CPSOURCE="${1}"
CPDEST="${2}" CPDEST="${2}"
for _jail in ${JAILS}; do for _jail in ${JAILS}; do
bastille_jail_path="$(jls -j "${_jail}" path)"
info "[${_jail}]:" info "[${_jail}]:"
bastille_jail_path="${bastille_jailsdir}/${_jail}/root"
cp -av "${CPSOURCE}" "${bastille_jail_path}/${CPDEST}" cp -av "${CPSOURCE}" "${bastille_jail_path}/${CPDEST}"
RETURN="$?" RETURN="$?"
if [ "${TARGET}" = "ALL" ]; then if [ "${TARGET}" = "ALL" ]; then