From 92f6f66814c0d9e9a82048ac99cf50d839678dc3 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Sun, 21 Nov 2010 07:59:04 -0800
Subject: Bugfix 6457: Don't ask the question if you're not going to like the
 answer.

---
 scripts/install/install-image | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'scripts/install/install-image')

diff --git a/scripts/install/install-image b/scripts/install/install-image
index cd486404..c201be3c 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -208,21 +208,23 @@ fi
 trap sig_handler INT KILL
 trap exit_handler EXIT
 
-cat <<EOF
+if is_live_cd_boot; then
+    cat <<EOF
 Welcome to the Vyatta install program.  This script
 will walk you through the process of installing the
 Vyatta image to a local hard drive.
 EOF
 
-response=''
-while [ -z "$response" ]
-do
-  echo -n "Would you like to continue? (Yes/No) [Yes]: "
-  response=$(get_response "Yes" "Yes No Y N")
-  if [ "$response" == "no" ] || [ "$response" == "n" ]; then
-    fail_exit 'Ok then.'
-  fi
-done
+    response=''
+    while [ -z "$response" ]
+    do
+	echo -n "Would you like to continue? (Yes/No) [Yes]: "
+	response=$(get_response "Yes" "Yes No Y N")
+	if [ "$response" == "no" ] || [ "$response" == "n" ]; then
+	    fail_exit 'Ok then.'
+	fi
+    done
+fi
 
 if is_live_cd_boot; then
   if [ -n "$NEW_ISO" ]; then
-- 
cgit v1.2.3