From 411f439aada93bbd4b35adb1cf1a226a5b5bdfe0 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Thu, 24 Nov 2016 10:43:23 -0200
Subject: Silence kenv calls

---
 src/etc/inc/pfsense-utils.inc | 2 +-
 src/etc/inc/system.inc        | 6 +++---
 src/etc/pfSense-rc            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/etc')

diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index c018f24..0cc6416 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -1872,7 +1872,7 @@ function load_thermal_hardware() {
  ******/
 function isvm() {
 	$virtualenvs = array("vmware", "parallels", "qemu", "bochs", "plex86", "VirtualBox");
-	$_gb = exec('/bin/kenv smbios.system.product 2>/dev/null', $output, $rc);
+	$_gb = exec('/bin/kenv -q smbios.system.product 2>/dev/null', $output, $rc);
 
 	if ($rc != 0 || !isset($output[0])) {
 		return false;
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 883c09f..95205ff 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -2145,7 +2145,7 @@ EOD;
 
 function system_get_serial() {
 	unset($output);
-	$_gb = exec('/bin/kenv smbios.system.serial 2>/dev/null', $output);
+	$_gb = exec('/bin/kenv -q smbios.system.serial 2>/dev/null', $output);
 	$serial = $output[0];
 
 	$vm_guest = get_single_sysctl('kern.vm_guest');
@@ -2172,8 +2172,8 @@ function system_identify_specific_platform() {
 	/* Try to guess from smbios strings */
 	unset($product);
 	unset($maker);
-	$_gb = exec('/bin/kenv smbios.system.product 2>/dev/null', $product);
-	$_gb = exec('/bin/kenv smbios.system.maker 2>/dev/null', $maker);
+	$_gb = exec('/bin/kenv -q smbios.system.product 2>/dev/null', $product);
+	$_gb = exec('/bin/kenv -q smbios.system.maker 2>/dev/null', $maker);
 	switch ($product[0]) {
 		case 'FW7541':
 			return (array('name' => 'FW7541', 'descr' => 'Netgate FW7541'));
diff --git a/src/etc/pfSense-rc b/src/etc/pfSense-rc
index eaa6b48..e46ed23 100755
--- a/src/etc/pfSense-rc
+++ b/src/etc/pfSense-rc
@@ -60,7 +60,7 @@ if [ ! -z "`sysctl -Nq debug.ddb.scripting.scripts`" ]; then
 	/sbin/ddb /etc/${product}-ddb.conf
 fi
 
-fsck_forced_iterations=`/bin/kenv pfsense.fsck.force`
+fsck_forced_iterations=`/bin/kenv -q pfsense.fsck.force`
 if [ ! -z "${fsck_forced_iterations}" ]; then
 	echo "Forcing filesystem check (${fsck_forced_iterations} times)..."
 	while [ ${fsck_forced_iterations} -gt 0 ]; do
-- 
cgit v1.1