From 9cf6655b46bba17e62bdbf8408ffc739de30f265 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 14 Jul 2017 06:39:46 +0200
Subject: [PATCH] wizard: do not force change of root password

We are forcing a change through the installer, which is where
the majority starts from.  We don't want to enforce a change
twice.

We can't really see if we installed or went through a factory
reset, so this is (was) the best of both worlds in conjunction
with the new installer feature.

While here, annotate that it is possible to leave it "empty".

This reverts commit 5eb2c986ca7233f0f94f372968433b145b4b3249.
---
 src/wizard/system.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/wizard/system.xml b/src/wizard/system.xml
index 727e9ca6c..bbd1ec5ba 100644
--- a/src/wizard/system.xml
+++ b/src/wizard/system.xml
@@ -545,6 +545,7 @@
 		<field>
 			<name>Admin Password</name>
 			<type>password</type>
+			<description>(leave empty to keep current one)</description>
 		</field>
 		<field>
 			<name>Admin Password AGAIN</name>
@@ -566,10 +567,7 @@
 			print_info_box("Passwords do not match! Please press back in your browser window and correct.");
 			die;
 		}
-	} else {
-		print_info_box("You must set a new password! Please press back in your browser window and correct.");
-		die;
-        }
+	}
 	</stepsubmitphpaction>
 </step>
 <step>