Cloned2Preserve
/
jailmaker
mirror of https://github.com/Jip-Hop/jailmaker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update jlmkr.sh

This commit is contained in:
Jip-Hop 2023-01-25 21:43:19 +01:00
parent 427259c344
commit e9ec153f7d
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jlmkr.sh
View File

@ -9,7 +9,7 @@ SCRIPT_DIR_PATH="$(dirname "${ABSOLUTE_SCRIPT_PATH}")"
USAGE="WARNING: EXPERIMENTAL AND WORK IN PROGRESS, USE ONLY FOR TESTING! USAGE="WARNING: EXPERIMENTAL AND WORK IN PROGRESS, USE ONLY FOR TESTING!
TODO: add version string TODO: add version string
Usage: ./${SCRIPT_NAME} COMMAND [ARG...] Usage: ./${SCRIPT_NAME} COMMAND [ARG]
TODO: complete writing usage TODO: complete writing usage
" "
@ -38,13 +38,14 @@ trap 'err $LINENO' ERR
##################### #####################
start_jail() { start_jail() {
[[ -z "${1}" ]] && fail "Please specify the name of the jail to start."
local jail_name="${1}" local jail_name="${1}"
local jail_path="${JAILS_DIR_PATH}/${jail_name}" local jail_path="${JAILS_DIR_PATH}/${jail_name}"
local jail_config_path="${jail_path}/${JAIL_CONFIG_NAME}" local jail_config_path="${jail_path}/${JAIL_CONFIG_NAME}"
! [[ -f "${jail_config_path}" ]] && fail "ERROR: Couldn't find: ${jail_config_path}" ! [[ -f "${jail_config_path}" ]] && fail "ERROR: Couldn't find: ${jail_config_path}."
echo 'Load the config' echo 'Loading config...'
local key value local key value
@ -62,7 +63,7 @@ start_jail() {
done <"${jail_config_path}" done <"${jail_config_path}"
echo 'Config loaded' echo 'Config loaded!'
local systemd_run_additional_args=("--unit='jlmkr-${jail_name}'" "--working-directory='./${jail_path}'" "--description='jailmaker ${jail_name}'") local systemd_run_additional_args=("--unit='jlmkr-${jail_name}'" "--working-directory='./${jail_path}'" "--description='jailmaker ${jail_name}'")
local systemd_nspawn_additional_args=("--machine='${jail_name}'" "--directory='${JAIL_ROOTFS_NAME}'") local systemd_nspawn_additional_args=("--machine='${jail_name}'" "--directory='${JAIL_ROOTFS_NAME}'")
@ -99,16 +100,31 @@ start_jail() {
local cmd=(systemd-run "${systemd_run_default_args}" "${systemd_run_additional_args[*]}" -- local cmd=(systemd-run "${systemd_run_default_args}" "${systemd_run_additional_args[*]}" --
systemd-nspawn "${systemd_nspawn_default_args}" "${systemd_nspawn_additional_args[*]} ${systemd_nspawn_user_args}") systemd-nspawn "${systemd_nspawn_default_args}" "${systemd_nspawn_additional_args[*]} ${systemd_nspawn_user_args}")
echo
echo "Starting jail with command:" echo "Starting jail with command:"
echo "${cmd[*]}" echo "${cmd[*]}"
echo
eval "${cmd[*]}" eval "${cmd[*]}"
echo
echo "Check logging:"
echo "journalctl -u jlmkr-${jail_name}"
echo
echo "Check status:"
echo "systemctl status jlmkr-${jail_name}"
echo
echo "Stop the jail:"
echo "machinectl stop ${jail_name}"
echo
echo "Get a shell:"
echo "machinectl shell ${jail_name}"
} }
###################### ######################
# CREATE FUNCTIONALITY # CREATE FUNCTIONALITY
####################### ######################
cleanup() { cleanup() {
# Remove the jail_path if it's a directory # Remove the jail_path if it's a directory
@ -376,7 +392,7 @@ create)
;; ;;
start) start)
start_jail "${2}" start_jail "${2-""}"
;; ;;
*) *)