Ovirt devel - Mar 2009 - [PATCH node] display /etc/issue in configuration menu

to show up-to-date version information

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 scripts/ovirt-config-boot         |    2 +-
 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   |    2 +-
 scripts/ovirt-config-password     |    2 +-
 scripts/ovirt-config-setup        |    8 +++++---
 scripts/ovirt-config-storage      |    2 +-
 9 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/scripts/ovirt-config-boot b/scripts/ovirt-config-boot
index 0462c13..e4fb365 100755
--- a/scripts/ovirt-config-boot
+++ b/scripts/ovirt-config-boot
@@ -28,7 +28,7 @@ ovirt_boot_setup() {
     local disk
     local disk2
     local partN=-1
-    log "installing oVirt Node image."
+    log "installing the image."
     mount_boot
     # check that /boot mounted ok and find partition number for GRUB
     eval $(mount|awk '$3 == "/boot" {
diff --git a/scripts/ovirt-config-boot-wrapper
b/scripts/ovirt-config-boot-wrapper
index 5264bed..175c44b 100755
--- a/scripts/ovirt-config-boot-wrapper
+++ b/scripts/ovirt-config-boot-wrapper
@@ -8,7 +8,7 @@
 rc=0
 while true; do
     clear
-    printf "\n\n oVirt Node Local Installation and Reboot\n\n"
+    printf "\n\n Local Installation and Reboot\n\n"
 
     printf "\nThis option will exit the menu, and require a reboot. \n\
 Please ensure that you have configured the local storage \n\
diff --git a/scripts/ovirt-config-collectd b/scripts/ovirt-config-collectd
index 4fe0e23..e509e54 100755
--- a/scripts/ovirt-config-collectd
+++ b/scripts/ovirt-config-collectd
@@ -104,7 +104,7 @@ if [ "$1" = "AUTO" ]; then
         ovirt_collectd $OVIRT_COLLECTD_SERVER $OVIRT_COLLECTD_PORT
     fi
 else
-    printf "\n\n oVirt Node Collectd Configuration\n\n"
+    printf "\n\n Collectd Configuration\n\n"
     prompt_user
 fi
 
diff --git a/scripts/ovirt-config-hostname b/scripts/ovirt-config-hostname
index f369d0e..7f51a44 100755
--- a/scripts/ovirt-config-hostname
+++ b/scripts/ovirt-config-hostname
@@ -75,7 +75,7 @@ if [ "$1" = "AUTO" ]; then
         printf "\nHostname not provided. Skipping.\n"
     fi
 else
-    printf "\n\n oVirt Node Hostname Configuration\n\n"
+    printf "\n\n Hostname Configuration\n\n"
     prompt_user
 fi
 
diff --git a/scripts/ovirt-config-logging b/scripts/ovirt-config-logging
index 52135c3..5da991f 100755
--- a/scripts/ovirt-config-logging
+++ b/scripts/ovirt-config-logging
@@ -182,7 +182,7 @@ if [ "$1" = "AUTO" ]; then
         ovirt_rsyslog $OVIRT_SYSLOG_SERVER $OVIRT_SYSLOG_PORT udp
     fi
 else
-    printf "\n\n oVirt Node Logging Configuration\n\n"
+    printf "\n\n Logging Configuration\n\n"
     prompt_user
 fi
 
diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking
index 64074c3..9a1ff2b 100755
--- a/scripts/ovirt-config-networking
+++ b/scripts/ovirt-config-networking
@@ -254,7 +254,7 @@ else
     setup_menu
 
     while true; do
-        printf "\n\n oVirt Node Networking Configuration\n\n"
>&2
+        printf "\n\n Networking Configuration\n\n" >&2
 
         select NIC in $NICS "DNS" "NTP" "Save &
Exit"
         do
diff --git a/scripts/ovirt-config-password b/scripts/ovirt-config-password
index 69ef0dd..7abfb3b 100755
--- a/scripts/ovirt-config-password
+++ b/scripts/ovirt-config-password
@@ -30,7 +30,7 @@ function prompt_sasl_user {
     done
 }
 
-printf "\n\n oVirt Node Password Configuration\n\n"
+printf "\n\n Password Configuration\n\n"
 
 # prompt user
 # Set the password for the root user first
diff --git a/scripts/ovirt-config-setup b/scripts/ovirt-config-setup
index 79c86b8..72912fe 100755
--- a/scripts/ovirt-config-setup
+++ b/scripts/ovirt-config-setup
@@ -2,6 +2,7 @@
 #
 # Entry point for configuring an oVirt node when running in standalone mode.
 
+
 . /etc/init.d/ovirt-functions
 
 # symlinked scripts for menu options, link name is menu label
@@ -36,13 +37,14 @@ OPTIONS[${#OPTIONS[*]}]="$CONTINUE"
 
 # reset tty, otherwise serial console is broken
 reset > /dev/null
-clear
 
 while true; do
     PS3="Please select an option: "
 
     while true ; do
-        printf "\n\n oVirt Node Stand-alone Configuration\n\n"
>&2
+        clear
+        grep -v ^Kernel /etc/issue
+        printf "\n\n Stand-alone Configuration\n\n" >&2
 
         select OPTION in "${OPTIONS[@]}"
         do
@@ -51,8 +53,8 @@ while true; do
                 "$CONTINUE") exit 0 ;;
                 "") break ;;
                 *)
-                    clear;
                     {
+                        printf "\n\n"
                         if $CONFIG_DIR/*"$OPTION" ; then
                             printf "\n"
                         else
diff --git a/scripts/ovirt-config-storage b/scripts/ovirt-config-storage
index 53cf113..73dcaf4 100755
--- a/scripts/ovirt-config-storage
+++ b/scripts/ovirt-config-storage
@@ -518,7 +518,7 @@ else
     PS3="Choose an option: "
 
     while true; do
-        printf "\n\n oVirt Node Storage Configuration\n\n" >&2
+        printf "\n\n Storage Configuration\n\n" >&2
 
         select OPTION in $OPTIONS
         do
-- 
1.6.0.6