Merge pull request #414 from hackacad/linux_compat
Fix VNET issue causes by Linux compat
This commit is contained in:
@@ -304,7 +304,13 @@ create_jail() {
|
|||||||
if [ -n "${INTERFACE}" ]; then
|
if [ -n "${INTERFACE}" ]; then
|
||||||
local bastille_jail_conf_interface=${INTERFACE}
|
local bastille_jail_conf_interface=${INTERFACE}
|
||||||
fi
|
fi
|
||||||
generate_jail_conf
|
|
||||||
|
## generate the jail configuration file
|
||||||
|
if [ -n "${VNET_JAIL}" ]; then
|
||||||
|
generate_vnet_jail_conf
|
||||||
|
else
|
||||||
|
generate_jail_conf
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## using relative paths here
|
## using relative paths here
|
||||||
@@ -386,7 +392,7 @@ create_jail() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ -n "${VNET_JAIL}" ]; then
|
if [ -z "${LINUX_JAIL}" ]; then
|
||||||
## create home directory if missing
|
## create home directory if missing
|
||||||
if [ ! -d "${bastille_jail_path}/usr/home" ]; then
|
if [ ! -d "${bastille_jail_path}/usr/home" ]; then
|
||||||
mkdir -p "${bastille_jail_path}/usr/home"
|
mkdir -p "${bastille_jail_path}/usr/home"
|
||||||
@@ -507,6 +513,7 @@ fi
|
|||||||
EMPTY_JAIL=""
|
EMPTY_JAIL=""
|
||||||
THICK_JAIL=""
|
THICK_JAIL=""
|
||||||
VNET_JAIL=""
|
VNET_JAIL=""
|
||||||
|
LINUX_JAIL=""
|
||||||
|
|
||||||
# Handle and parse options
|
# Handle and parse options
|
||||||
while [ $# -gt 0 ]; do
|
while [ $# -gt 0 ]; do
|
||||||
|
|||||||
Reference in New Issue
Block a user