[Ovirt-devel] [PATCH node] update o-c-networking, o-c-storage menu options to be more clear

[Alan Pevec]

From: Joey Boggs <jboggs at redhat.com>

---
 scripts/ovirt-config-networking |    4 ++--
 scripts/ovirt-config-storage    |    9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking
index 143c985..e8a8624 100755
--- a/scripts/ovirt-config-networking
+++ b/scripts/ovirt-config-networking
@@ -279,13 +279,13 @@ else
     while true; do
         printf "\n\n Networking Configuration\n\n" >&2
 
-        select NIC in $NICS "DNS" "NTP" "Save & Exit"
+        select NIC in $NICS "DNS" "NTP" "Save And Return To Menu"
         do
             printf "\n"
             case "$NIC" in
                 "DNS") configure_dns "$OVIRT_DNS"; break ;;
 		"NTP") configure_ntp "$OVIRT_NTP"; break ;;
-                "Save & Exit") break 2;;
+                "Save And Return To Menu") break 2;;
                 *)
                     if [[ -n "${NIC}" ]] && [[ "${NICS}" =~ "${NIC}" ]]; then
                         configure_interface $NIC $IFACE_NUMBER
diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage
index 716b8fb..7efa299 100755
--- a/scripts/ovirt-config-storage
+++ b/scripts/ovirt-config-storage
@@ -531,19 +531,20 @@ if [ "$1" == "AUTO" ]; then
 	log "Missing device parameter: unable to partition any disk"
     fi
 else
-    OPTIONS="Configure Review Partition Quit"
+    OPTIONS="\"Configure\" \"Review\" \"Commit Changes And Quit\" \"Return To Menu\""
+    eval set $OPTIONS
     PS3="Choose an option: "
 
     while true; do
         printf "\n\n Storage Configuration\n\n" >&2
 
-        select OPTION in $OPTIONS
+        select OPTION in "$@"
         do
             case "$OPTION" in
                 "Configure") do_configure ; break ;;
                 "Review")    do_review    ; break ;;
-                "Partition") do_confirm   ; break ;;
-                "Quit")      printf "\nExiting.\n"; exit ;;
+                "Commit Changes And Quit") do_confirm   ; break ;;
+                "Return To Menu")      printf "\nExiting.\n"; exit ;;
             esac
         done
     done
-- 
1.6.0.6