From d20f5829c3954d9b94ad148ebef1cfcfe42dd2b0 Mon Sep 17 00:00:00 2001 From: Bike Dude Date: Mon, 12 Jul 2021 09:25:52 +0200 Subject: [PATCH 1/3] fix vnet issue --- usr/local/share/bastille/create.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh index 3eb7dbc9..a15eb32d 100644 --- a/usr/local/share/bastille/create.sh +++ b/usr/local/share/bastille/create.sh @@ -304,7 +304,13 @@ create_jail() { if [ -n "${INTERFACE}" ]; then local bastille_jail_conf_interface=${INTERFACE} fi - generate_jail_conf + + ## generate the jail configuration file + if [ -n "${VNET_JAIL}" ]; then + generate_vnet_jail_conf + else + generate_jail_conf + fi fi ## using relative paths here From 9bb11c5d541678e0181b1efae1090550fe6a94b8 Mon Sep 17 00:00:00 2001 From: Bike Dude Date: Mon, 12 Jul 2021 09:42:07 +0200 Subject: [PATCH 2/3] linux vs. /usr/home fix --- usr/local/share/bastille/create.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh index a15eb32d..79bb1b70 100644 --- a/usr/local/share/bastille/create.sh +++ b/usr/local/share/bastille/create.sh @@ -392,7 +392,7 @@ create_jail() { fi fi fi - if [ -n "${VNET_JAIL}" ]; then + if [ -z "${LINUX_JAIL}" ]; then ## create home directory if missing if [ ! -d "${bastille_jail_path}/usr/home" ]; then mkdir -p "${bastille_jail_path}/usr/home" From 9ff87f2904e72146a66cb2bf072f9f4cea31f7af Mon Sep 17 00:00:00 2001 From: Bike Dude Date: Mon, 12 Jul 2021 10:02:51 +0200 Subject: [PATCH 3/3] reset LINUX_JAIL option --- usr/local/share/bastille/create.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/usr/local/share/bastille/create.sh b/usr/local/share/bastille/create.sh index 79bb1b70..7964d68c 100644 --- a/usr/local/share/bastille/create.sh +++ b/usr/local/share/bastille/create.sh @@ -505,6 +505,7 @@ fi EMPTY_JAIL="" THICK_JAIL="" VNET_JAIL="" +LINUX_JAIL="" ## handle combined options then shift if [ "${1}" = "-T" -o "${1}" = "--thick" -o "${1}" = "thick" ] && \