From cfbf2a4fea81d76f1903629facc1a009244ad902 Mon Sep 17 00:00:00 2001 From: Jose Date: Thu, 27 Aug 2020 08:13:19 -0400 Subject: [PATCH] Fix for jail auto-start with names containing dashes --- CHANGELOG | 1 + bastille-init | 2 +- version | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2c35501..8515534 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.0.70......Fix for jail auto-start with names containing dashes. 1.0.69......Fix for jail auto-start settings with names containing dashes. 1.0.68......Remove the -q option in utilities page. 1.0.67......Fix for properly identify the jail type, thanks to mvdhoeven. diff --git a/bastille-init b/bastille-init index 1006d14..e594c84 100755 --- a/bastille-init +++ b/bastille-init @@ -953,7 +953,7 @@ ext_start() if [ -d "${CWDIR}/jails" ]; then JAIL_LIST=$(bastille list jail) for jail in ${JAIL_LIST}; do - if sysrc -f ${CWDIR}${EXTCONF} -qn ${jail}_AUTO_START | grep -w "YES" >/dev/null; then + if grep -qw "${jail}_AUTO_START=\"YES\"" ${CWDIR}${EXTCONF}; then if ! jls | sed "1 d" | awk '{print $3}' | grep -qw ${jail}; then bastille start ${jail} fi diff --git a/version b/version index 3116087..9d8637c 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.69 +1.0.70