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

use full path when calling jls binary

Browse Source
This commit is contained in:
Christer Edwards
2021-12-17 19:09:49 -07:00
parent 8a4b0a1f5c
commit faf3b2b691
14 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ fi
if [ -n "${SAFE_EXPORT}" ]; then
# Check if container is running, otherwise just ignore
if [ -z "$(jls name | awk "/^${TARGET}$/")" ]; then
if [ -z "$(/usr/sbin/jls name | awk "/^${TARGET}$/")" ]; then
SAFE_EXPORT=
fi
fi
@@ -212,7 +212,7 @@ clean_zfs_snap() {
export_check() {
# Inform the user about the exporting method
if [ -z "${USER_EXPORT}" ]; then
if [ -n "$(jls name | awk "/^${TARGET}$/")" ]; then
if [ -n "$(/usr/sbin/jls name | awk "/^${TARGET}$/")" ]; then
if [ -n "${SAFE_EXPORT}" ]; then
EXPORT_AS="Safely exporting"
else
@@ -336,7 +336,7 @@ if [ -n "${TARGET}" ]; then
# Check if is a ZFS system
if [ "${bastille_zfs_enable}" != "YES" ]; then
# Check if container is running and ask for stop in non ZFS systems
if [ -n "$(jls name | awk "/^${TARGET}$/")" ]; then
if [ -n "$(/usr/sbin/jls name | awk "/^${TARGET}$/")" ]; then
error_exit "${TARGET} is running. See 'bastille stop'."
fi
fi