Darryl L. Pierce
2009-Aug-10 13:41 UTC
[Ovirt-devel] [PATCH node] Changes all y/n/a prompts to use the full word instead.
This avoids any ambiguity regarding the prompt options.
Resolves: rhbz#516221
Signed-off-by: Darryl L. Pierce <dpierce at redhat.com>
---
scripts/ovirt-config-boot-wrapper | 2 +-
scripts/ovirt-config-collectd | 2 +-
scripts/ovirt-config-hostname | 2 +-
scripts/ovirt-config-logging | 2 +-
scripts/ovirt-config-networking | 10 +++++-----
scripts/ovirt-config-password | 2 +-
scripts/ovirt-config-storage | 4 ++--
scripts/ovirt-config-uninstall | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/scripts/ovirt-config-boot-wrapper
b/scripts/ovirt-config-boot-wrapper
index 5ff95ec..06f1088 100755
--- a/scripts/ovirt-config-boot-wrapper
+++ b/scripts/ovirt-config-boot-wrapper
@@ -24,7 +24,7 @@ continuing."
else
bootparams="${OVIRT_BOOTPARAMS}"
fi
- if ask_yes_or_no "Do you wish to continue (y/n)?"; then
+ if ask_yes_or_no "Do you wish to continue ([Y]es/[N]o)?"; then
mount_live \
&& /usr/sbin/ovirt-config-boot /live
"${bootparams}"
rc=$?
diff --git a/scripts/ovirt-config-collectd b/scripts/ovirt-config-collectd
index 3341838..4ad877e 100755
--- a/scripts/ovirt-config-collectd
+++ b/scripts/ovirt-config-collectd
@@ -67,7 +67,7 @@ prompt_user() {
printf "\n"
printf "\n"
while true; do
- ask_yes_or_no "Is this correct (y/n/a)?" true true
+ ask_yes_or_no "Is this correct ([Y]es/[N]o/[A]bort)?"
true true
rc=$?
case $rc in
0)
diff --git a/scripts/ovirt-config-hostname b/scripts/ovirt-config-hostname
index 8f1183b..deb81bd 100755
--- a/scripts/ovirt-config-hostname
+++ b/scripts/ovirt-config-hostname
@@ -55,7 +55,7 @@ function prompt_user {
fi
else
printf "\n"
- ask_yes_or_no "Blank out the hostnames (y/n)?"
+ ask_yes_or_no "Blank out the hostnames ([Y]es/[N]o)?"
case $? in
0)
if remove_hostname; then
diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging
index 280edcd..464dfcb 100755
--- a/scripts/ovirt-config-logging
+++ b/scripts/ovirt-config-logging
@@ -146,7 +146,7 @@ function prompt_user {
printf "\n"
printf "\n"
while true; do
- ask_yes_or_no "Is this correct (y/n/a)?" true true
+ ask_yes_or_no "Is this correct ([Y]es/[N]o/[A]bort)?"
true true
case $? in
0)
printf "\nSaving configuration.\n"
diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking
index 837d493..e114538 100755
--- a/scripts/ovirt-config-networking
+++ b/scripts/ovirt-config-networking
@@ -86,7 +86,7 @@ function configure_interface
if has_configured_interface; then
printf "This will delete the current configuration for
${CONFIGURED_NIC}.\n"
- if ask_yes_or_no "Do you wish to continue (y/n)?"; then
+ if ask_yes_or_no "Do you wish to continue ([Y]es/[N]o)?";
then
printf "\nDeleting existing network configuration...\n"
cp -a /etc/sysconfig/network-scripts/ifcfg-lo
/etc/sysconfig/network-scripts/backup.lo
remove_config /etc/sysconfig/network-scripts/ifcfg-*
@@ -132,11 +132,11 @@ function configure_interface
fi
echo "NIC is: $NICSTATUS"
- if ask_yes_or_no "Help identify ${NIC} by blinking lights for
10 seconds (y/n)?"; then
+ if ask_yes_or_no "Help identify ${NIC} by blinking lights for
10 seconds ([Y]es/[N]o)?"; then
ethtool --identify $NIC 10
fi
- ask_yes_or_no "Include VLAN support (y/n/a)? " true true
+ ask_yes_or_no "Include VLAN support ([Y]es/[N]o/[A]bort)?
" true true
case $? in
0)
while true; do
@@ -212,7 +212,7 @@ function configure_interface
esac
printf "\n"
- ask_yes_or_no "Is this correct (y/n/a)?" true true
+ ask_yes_or_no "Is this correct ([Y]es/[N]o/[A]bort)?"
true true
case $? in
0)
IF_CONFIG="$IF_CONFIG\nset $IF_ROOT/ONBOOT yes"
@@ -340,7 +340,7 @@ function configure_dns
done
printf "\n"
- ask_yes_or_no "Is this correct (y/n/a)?" true true
+ ask_yes_or_no "Is this correct ([Y]es/[N]o/[A]bort)?"
true true
case $? in
0) break ;;
1) ;;
diff --git a/scripts/ovirt-config-password b/scripts/ovirt-config-password
index ab0325a..e9789f8 100755
--- a/scripts/ovirt-config-password
+++ b/scripts/ovirt-config-password
@@ -65,7 +65,7 @@ EOF
toggle_ssh () {
printf "\nSSH password authentication\n\n"
- if ask_yes_or_no "Enable SSH password authentication (y/n)?";
then
+ if ask_yes_or_no "Enable SSH password authentication
([Y]es/[N]o)?"; then
toggle_ssh_access yes
else
toggle_ssh_access no
diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage
index 5560b5f..eed126c 100755
--- a/scripts/ovirt-config-storage
+++ b/scripts/ovirt-config-storage
@@ -208,7 +208,7 @@ do_configure()
printf " partition should use up the remaining space on the
disk.\n\n"
do_review
- if ask_yes_or_no "Use these default values (y/n)?"; then
+ if ask_yes_or_no "Use these default values ([Y]es/[N]o)?"; then
return
fi
@@ -473,7 +473,7 @@ do_confirm()
"$w8" \
"$w8"
- if ask_yes_or_no "Do you wish to proceed (y/n)?"; then
+ if ask_yes_or_no "Do you wish to proceed ([Y]es/[N]o)?"; then
if check_partition_sizes; then
perform_partitioning
exit 0
diff --git a/scripts/ovirt-config-uninstall b/scripts/ovirt-config-uninstall
index e545943..02828a0 100755
--- a/scripts/ovirt-config-uninstall
+++ b/scripts/ovirt-config-uninstall
@@ -27,7 +27,7 @@ cat <<EOF
EOF
-if ask_yes_or_no "Do you wish to continue and uninstall this node
(y/n)?"; then
+if ask_yes_or_no "Do you wish to continue and uninstall this node
([Y]es/[N]o)?"; then
if [ -d /dev/HostVG ]; then
log "Uninstalling node"
log "Detaching logging"
--
1.6.2.5