From 6e7f479ed1b3dc295015177160625958b3222135 Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 17 Aug 2020 17:22:37 -0400 Subject: [PATCH] Remove the -q option in utilities page --- CHANGELOG | 1 + gui/bastille_manager_util.php | 2 +- version | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 3a37f39..98ff5a4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ ====================== Version Description +1.0.68......Remove the -q option in utilities page. 1.0.67......Fix for properly identify the jail type, thanks to mvdhoeven. 1.0.66......Update extension and bastille config files at once. 1.0.65......Add ability to create empty containers, minor improvements. diff --git a/gui/bastille_manager_util.php b/gui/bastille_manager_util.php index 225cdf2..0073be5 100644 --- a/gui/bastille_manager_util.php +++ b/gui/bastille_manager_util.php @@ -436,7 +436,7 @@ $document->render(); #$current_release = exec("/usr/sbin/jexec {$pconfig['jailname']} freebsd-version 2>/dev/null"); unset($disable_base_change); $current_release = exec("/usr/bin/grep '\-RELEASE' {$jail_dir}/{$pconfig['jailname']}/fstab | awk '{print $1}' | grep -o '[^/]*$'"); - $is_thickjail = exec("/usr/bin/grep -qw '/.*/.bastille' {$jail_dir}/{$pconfig['jailname']}/fstab"); + $is_thickjail = exec("/usr/bin/grep -w '/.*/.bastille' {$jail_dir}/{$pconfig['jailname']}/fstab"); if (!$current_release): $current_release = exec("/usr/bin/grep 'releng' {$jail_dir}/{$pconfig['jailname']}/root/COPYRIGHT | cut -d '/' -f2"); $disable_base_change = "1"; diff --git a/version b/version index c8b4742..01c08cf 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.67 +1.0.68