Minor GUI fixes, revert makewhatis file addition

CHANGELOG

@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.0.84......Minor GUI fixes, revert makewhatis file addition.
 1.0.83......Improve jail/base update, execute fetch/install commands individually.
 1.0.82......Add missing system file to prevent makewhatis not found warning.
 1.0.81......Update GUI pages to work with later bastille releases.

bastille-init

@@ -391,11 +391,6 @@ include_files()
 				install -m 0555 ${SYSTEM_INCLUDE}/sum /usr/bin/sum
 			fi
 		fi
-		if [ ! -f "/usr/bin/makewhatis" ]; then
-			if [ -f "${SYSTEM_INCLUDE}/makewhatis" ]; then
-				install -m 0555 ${SYSTEM_INCLUDE}/makewhatis /usr/bin/makewhatis
-			fi
-		fi
 	else
 		sysrc -f ${CWDIR}${EXTCONF} VNET_ENABLE="NO" >/dev/null 2>&1
 	fi

gui/bastille_manager_jconf.php

@@ -318,6 +318,7 @@ if ($_POST):
 						// Remove obsolete variable.
 						exec("/usr/sbin/sysrc -f $configfile -x {$jail_name_def}_AUTO_START");
 					endif;
+					if(exec("/usr/sbin/sysrc -f $configfile -qn {$jail_name}_AUTO_START")):
 						$cmd = ("/usr/sbin/sysrc -f $configfile -x {$jail_name}_AUTO_START");
 						unset($output,$retval);mwexec2($cmd,$output,$retval);
 						if($retval == 0):
@@ -326,6 +327,7 @@ if ($_POST):
 							$input_errors[] = gtext("Failed to disable autostart.");
 						endif;
 					endif;
+				endif;
 
 				if (isset($_POST['jname']) && $_POST['jname']):
 					if($jail_name_def !== $jail_name):

gui/bastille_manager_util.php

@@ -244,7 +244,8 @@ if($_POST):
 					$container['jailname'] = $_POST['jailname'];
 					$confirm_name = $pconfig['confirmname'];
 					$item = $container['jailname'];
-					$cmd = ("/usr/sbin/sysrc -f {$configfile} -x {$item}_AUTO_START");
+					if(exec("/usr/sbin/sysrc -f $configfile -qn {$item}_AUTO_START")):
+						$cmd = ("/usr/sbin/sysrc -f $configfile -x {$item}_AUTO_START");
 						unset($output,$retval);mwexec2($cmd,$output,$retval);
 						if($retval == 0):
 							header('Location: bastille_manager_gui.php');
@@ -253,6 +254,7 @@ if($_POST):
 							$input_errors[] = gtext("Failed to set no-auto.");
 						endif;
 					endif;
+				endif;
 				break;
 
 			case 'fstab':

version

@@ -1 +1 @@
-1.0.83
+1.0.84