Merge pull request #642 from BastilleBSD/support_lowercase

fix logic for rc.conf + bastille.conf ZFS check
Merge pull request #641 from BastilleBSD/setup_vnet
2023-11-25 19:15:16 -07:00 · 2023-11-25 17:21:49 -07:00 · 2023-11-25 17:19:57 -07:00 · 2023-11-25 17:07:56 -07:00 · 2023-11-25 17:06:05 -07:00 · 2023-11-25 16:16:47 -07:00
2 changed files with 16 additions and 3 deletions
--- a/usr/local/share/bastille/bootstrap.sh
+++ b/usr/local/share/bastille/bootstrap.sh
@@ -474,9 +474,9 @@ if [ -n "${OPTION}" ] && [ "${OPTION}" != "${HW_MACHINE}" ] && [ "${OPTION}" !=
 fi

 ## allow override bootstrap URLs via environment variables
-[ -n ${BASTILLE_URL_FREEBSD} ] && bastille_url_freebsd="${BASTILLE_URL_FREEBSD}"
-[ -n ${BASTILLE_URL_HARDENEDBSD} ] && bastille_url_hardenedbsd="${BASTILLE_URL_HARDENEDBSD}"
-[ -n ${BASTILLE_URL_MIDNIGHTBSD} ] && bastille_url_midnightbsd="${BASTILLE_URL_MIDNIGHTBSD}"
+[ -n "${BASTILLE_URL_FREEBSD}" ] && bastille_url_freebsd="${BASTILLE_URL_FREEBSD}"
+[ -n "${BASTILLE_URL_HARDENEDBSD}" ] && bastille_url_hardenedbsd="${BASTILLE_URL_HARDENEDBSD}"
+[ -n "${BASTILLE_URL_MIDNIGHTBSD}" ] && bastille_url_midnightbsd="${BASTILLE_URL_MIDNIGHTBSD}"

 ## Filter sane release names
 case "${1}" in
--- a/usr/local/share/bastille/setup.sh
+++ b/usr/local/share/bastille/setup.sh
@@ -57,6 +57,19 @@ configure_vnet() {

    info "Bringing up new interface: bastille1"
    service netif cloneup
+
+    if [ ! -f /etc/devfs.rules ]; then
+        info "Creating bastille_vnet devfs.rules"
+        cat << EOF > /etc/devfs.rules
+[bastille_vnet=13]
+add include \$devfsrules_hide_all
+add include \$devfsrules_unhide_basic
+add include \$devfsrules_unhide_login
+add include \$devfsrules_jail
+add include \$devfsrules_jail_vnet
+add path 'bpf*' unhide
+EOF
+    fi
 }

 # Configure pf firewall
Author	SHA1	Message	Date
Christer Edwards	3a4ebc63bb	Merge pull request #642 from BastilleBSD/support_lowercase fix logic for rc.conf + bastille.conf ZFS check	2023-11-25 19:15:16 -07:00
Christer Edwards	bce28bf89a	Merge pull request #641 from BastilleBSD/setup_vnet add support for bastille_vnet devfs.rules in bastille setup	2023-11-25 17:21:49 -07:00
Christer Edwards	dd60e7f175	add support for bastille_vnet devfs.rules in bastille setup	2023-11-25 17:19:57 -07:00
Christer Edwards	32d67aea40	Merge pull request #640 from BastilleBSD/eol_patch fix for recent EOL support patch	2023-11-25 17:07:56 -07:00
Christer Edwards	b30a7484bb	fix for recent EOL support patch	2023-11-25 17:06:05 -07:00
Christer Edwards	86cb374732	Merge pull request #639 from BastilleBSD/support_lowercase support upper & lowercase values in bastille.conf	2023-11-25 16:16:47 -07:00