diff -Nur e-smith-base-5.8.0.old/root/sbin/e-smith/bootstrap-console e-smith-base-5.8.0/root/sbin/e-smith/bootstrap-console
--- e-smith-base-5.8.0.old/root/sbin/e-smith/bootstrap-console	2016-04-13 10:46:29.840000000 -0400
+++ e-smith-base-5.8.0/root/sbin/e-smith/bootstrap-console	2016-04-13 10:50:40.913000000 -0400
@@ -42,11 +42,14 @@
 use esmith::console::system_password;
 esmith::console::system_password->new->doit($console, $db);
 
-use esmith::console::configure;
-esmith::console::configure->new(bootstrap => 1)->doit($console, $db);
+if ($db->get_prop('bootstrap-console', 'Run') eq 'yes')
+{
+	use esmith::console::configure;
+	esmith::console::configure->new(bootstrap => 1)->doit($console, $db);
 
-use esmith::console::save_config;
-esmith::console::save_config->new->doit($console, $db);
+	use esmith::console::save_config;
+	esmith::console::save_config->new->doit($console, $db);
+}
 
 $ARGV[0] = 'tty';
 $console = esmith::console->new();