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

Merge pull request #475 from cedwards/jls_patch

Browse Source 
change new PKG option from -P to -H
This commit is contained in:
Christer Edwards
2021-12-23 14:19:10 -07:00
committed by GitHub
parent b7914ba67a 570c80ba85
commit 7558fd42ca
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
usr/local/bin/bastille
View File

@@ -155,7 +155,7 @@ clone|config|cmd|console|convert|cp|edit|htop|limits|mount|pkg|rename|service|st
JAILS="${JAILS} ${_jail}" JAILS="${JAILS} ${_jail}"
fi fi
done done
elif [ "${CMD}" = "pkg" ] && [ "${TARGET}" = '-P' ] || [ "${TARGET}" = '--pkg' ]; then elif [ "${CMD}" = "pkg" ] && [ "${TARGET}" = '-H' ] || [ "${TARGET}" = '--host' ]; then
TARGET="${1}" TARGET="${1}"
USE_HOST_PKG=1 USE_HOST_PKG=1
JAILS="${TARGET}" JAILS="${TARGET}"
@@ -191,6 +191,7 @@ clone|config|cmd|console|convert|cp|edit|htop|limits|mount|pkg|rename|service|st
;; ;;
esac esac
fi fi
export USE_HOST_PKG
export TARGET export TARGET
export JAILS export JAILS
fi fi

2
usr/local/share/bastille/pkg.sh
View File

@@ -31,7 +31,7 @@
. /usr/local/share/bastille/common.sh . /usr/local/share/bastille/common.sh
usage() { usage() {
error_exit "Usage: bastille pkg [-P|--pkg] TARGET command [args]" error_exit "Usage: bastille pkg [-H|--host] TARGET command [args]"
} }
# Handle special-case commands first. # Handle special-case commands first.