Sync w/ HEAD.

1 files changed, 14 insertions, 22 deletions

diff --git a/etc/rc.initial.password b/etc/rc.initial.password
index a12de05..6cf0228 100755
--- a/etc/rc.initial.password
+++ b/etc/rc.initial.password
@@ -36,37 +36,29 @@
 
 	$fp = fopen('php://stdin', 'r');
 
-	echo <<<EOD
-
-The webConfigurator password will be reset to the default (which is 'pfsense').
-
-Do you want to proceed [y|n]? 
-EOD;
+	echo "\n" . gettext('
+The webConfigurator password will be reset to the default (which is "' . strtolower($g['product_name']) . '").') . "\n" .
+	gettext('Do you want to proceed [y|n]?');
 
 	if (strcasecmp(chop(fgets($fp)), "y") == 0) {
-	
-		$config['system']['username'] = "admin";
-		$config['system']['password'] = crypt("pfsense");
+    $adminUserName = getUNIXRootName();
+		setUserName($adminUserName, "admin");
+		setUserPWD($adminUserName, strtolower($g['product_name']));
 
-		write_config("password changed from console menu");
+		write_config(gettext("password changed from console menu"));
 		system_password_configure();
 
-		echo <<<EOD
-
+		echo "\n" . gettext('
 The password for the webConfigurator has been reset and 
-the default username has been set to "admin".
-
+the default username has been set to "admin".') . "\n" .
+		gettext('
 Remember to set the password to something else than
-the default as soon as you have logged into the webConfigurator.
-
-Press ENTER to continue.
-
-EOD;
+the default as soon as you have logged into the webConfigurator.') . "\n" .
+		gettext("Press ENTER to continue.");
 
 		fgets($fp);
 	}
         
-	sync_webgui_passwords();
-
-	fclose($fp);
+        sync_webgui_passwords();
+        
 ?>
\ No newline at end of file