From 3069587239cfd1750a832d1cc61c9c65fd2cbd36 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 12 May 2017 07:14:18 +0200
Subject: [PATCH] rc: unify yes/no prompts and indicate their default option
 when blank

---
 src/etc/inc/console.inc     | 10 +++++-----
 src/etc/rc.initial.defaults |  4 ++--
 src/etc/rc.initial.halt     |  2 +-
 src/etc/rc.initial.reboot   |  2 +-
 src/etc/rc.initial.restore  |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/etc/inc/console.inc b/src/etc/inc/console.inc
index 4e0da63ce..a3ab3ecdc 100644
--- a/src/etc/inc/console.inc
+++ b/src/etc/inc/console.inc
@@ -53,7 +53,7 @@ function set_networking_interfaces_ports($probe = false)
 	global $config;
 
 	$fp = fopen('php://stdin', 'r');
-	$yes_no_prompt = '[y|n]? ';
+	$yes_no_prompt = '[y/N]: ';
 	$interactive = true;
 	$key = null;
 
@@ -95,7 +95,7 @@ EOD;
 You now have the opportunity to configure VLANs.  If you don't require VLANs
 for initial connectivity, say no here and use the GUI to configure VLANs later.
 
-Do you want to set up VLANs now ${yes_no_prompt}
+Do you want to set up VLANs now? ${no_yes_prompt}
 EOD;
 	if ($interactive) {
 		$key = chop(fgets($fp));
@@ -277,7 +277,7 @@ EOD;
 
 	echo <<<EOD
 
-Do you want to proceed ${yes_no_prompt}
+Do you want to proceed? ${yes_no_prompt}
 EOD;
 	if ($interactive) {
 		$key = chop(fgets($fp));
@@ -454,7 +454,7 @@ function vlan_setup($iflist, $fp)
 {
 	global $config;
 
-	$yes_no_prompt = '[y|n]? ';
+	$yes_no_prompt = '[y/N]: ';
 
 	if (isset($config['vlans']['vlan'])) {
 
@@ -462,7 +462,7 @@ function vlan_setup($iflist, $fp)
 
 WARNING: all existing VLANs will be cleared if you proceed!
 
-Do you want to proceed ${yes_no_prompt}
+Do you want to proceed? ${yes_no_prompt}
 EOD;
 
 		if (strcasecmp(chop(fgets($fp)), "y") != 0) {
diff --git a/src/etc/rc.initial.defaults b/src/etc/rc.initial.defaults
index 340803772..b6b51c35b 100755
--- a/src/etc/rc.initial.defaults
+++ b/src/etc/rc.initial.defaults
@@ -32,13 +32,13 @@ require_once("config.inc");
 require_once("system.inc");
 
 $fp = fopen('php://stdin', 'r');
-$yes_no_prompt = '[y|n]? ';
+$yes_no_prompt = '[y/N]: ';
 
 echo <<<EOD
 You are about to reset the firewall to factory defaults.
 The firewall will reboot after resetting the configuration.
 
-Do you want to proceed {$yes_no_prompt}
+Do you want to proceed? {$yes_no_prompt}
 EOD;
 
 if (strcasecmp(chop(fgets($fp)), 'y') == 0) {
diff --git a/src/etc/rc.initial.halt b/src/etc/rc.initial.halt
index ab1b49d01..bafe023ce 100755
--- a/src/etc/rc.initial.halt
+++ b/src/etc/rc.initial.halt
@@ -34,7 +34,7 @@ require_once("system.inc");
 
 $fp = fopen('php://stdin', 'r');
 
-echo "The system will halt and power off.  Do you want to proceed [y|n]? ";
+echo 'The system will halt and power off. Do you want to proceed? [y/N]: ';
 
 if (strcasecmp(chop(fgets($fp)), 'y') == 0) {
     system_halt(true);
diff --git a/src/etc/rc.initial.reboot b/src/etc/rc.initial.reboot
index 3f77e43ba..f4cf80a47 100755
--- a/src/etc/rc.initial.reboot
+++ b/src/etc/rc.initial.reboot
@@ -33,7 +33,7 @@ require_once("system.inc");
 
 $fp = fopen('php://stdin', 'r');
 
-echo "The system will reboot.  Do you want to proceed [y|n]? ";
+echo 'The system will reboot. Do you want to proceed? [y/N]: ';
 
 if (strcasecmp(chop(fgets($fp)), 'y') == 0) {
     system_reboot(true);
diff --git a/src/etc/rc.initial.restore b/src/etc/rc.initial.restore
index 5e4ccb928..f4fc9fdc5 100755
--- a/src/etc/rc.initial.restore
+++ b/src/etc/rc.initial.restore
@@ -69,7 +69,7 @@ function restore_history_backup($number)
 		list_backups($number);
 		$filename = array_keys($confvers)[$number-1];
 		$thisbackup = $confvers[$filename];
-		echo 'Y/N? : ';
+		echo '[y/N]: ';
 		$confirm = strtoupper(chop(fgets($fp)));
 		if ($confirm == 'Y') {
 			$cnf = OPNsense\Core\Config::getInstance();