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

Merge pull request #461 from robarnold/devfs

Browse Source 
Use the devfs_ruleset number from imported iocage jails
This commit is contained in:
Christer Edwards
2021-12-09 10:46:58 -07:00
committed by GitHub
parent d6b12f93e7 5aba3df6ae
commit 2327c6a662
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
usr/local/share/bastille/import.sh
+4 -1
View File
@@ -173,6 +173,7 @@ generate_config() {
# Attempt to read previous config file and set required variables accordingly # Attempt to read previous config file and set required variables accordingly
# If we can't get a valid interface, fallback to lo1 and warn user # If we can't get a valid interface, fallback to lo1 and warn user
info "Generating jail.conf..." info "Generating jail.conf..."
DEVFS_RULESET=4
if [ "${FILE_EXT}" = ".zip" ]; then if [ "${FILE_EXT}" = ".zip" ]; then
# Gather some bits from foreign/iocage config files # Gather some bits from foreign/iocage config files
@@ -180,6 +181,8 @@ generate_config() {
if [ -n "${JSON_CONFIG}" ]; then if [ -n "${JSON_CONFIG}" ]; then
IPV4_CONFIG=$(grep -wo '\"ip4_addr\": \".*\"' "${JSON_CONFIG}" | tr -d '" ' | sed 's/ip4_addr://') IPV4_CONFIG=$(grep -wo '\"ip4_addr\": \".*\"' "${JSON_CONFIG}" | tr -d '" ' | sed 's/ip4_addr://')
IPV6_CONFIG=$(grep -wo '\"ip6_addr\": \".*\"' "${JSON_CONFIG}" | tr -d '" ' | sed 's/ip6_addr://') IPV6_CONFIG=$(grep -wo '\"ip6_addr\": \".*\"' "${JSON_CONFIG}" | tr -d '" ' | sed 's/ip6_addr://')
DEVFS_RULESET=$(grep -wo '\"devfs_ruleset\": \".*\"' "${JSON_CONFIG}" | tr -d '" ' | sed 's/devfs_ruleset://')
DEVFS_RULESET=${DEVFS_RULESET:-4}
fi fi
elif [ "${FILE_EXT}" = ".tar.gz" ]; then elif [ "${FILE_EXT}" = ".tar.gz" ]; then
# Gather some bits from foreign/ezjail config files # Gather some bits from foreign/ezjail config files
@@ -257,7 +260,7 @@ generate_config() {
# Generate a basic jail configuration file on foreign imports # Generate a basic jail configuration file on foreign imports
cat << EOF > "${bastille_jailsdir}/${TARGET_TRIM}/jail.conf" cat << EOF > "${bastille_jailsdir}/${TARGET_TRIM}/jail.conf"
${TARGET_TRIM} { ${TARGET_TRIM} {
devfs_ruleset = 4; devfs_ruleset = ${DEVFS_RULESET};
enforce_statfs = 2; enforce_statfs = 2;
exec.clean; exec.clean;
exec.consolelog = ${bastille_logsdir}/${TARGET_TRIM}_console.log; exec.consolelog = ${bastille_logsdir}/${TARGET_TRIM}_console.log;