From: Christopher Clark <christopher.clark@citrix.com>
Date: Mon, 4 Jan 2010 22:50:30 +0000 (-0800)
Subject: XC-1017: Host installer: Fix backwards w/ Escape key
X-Git-Url: http://xenbits.xen.org/gitweb?a=commitdiff_plain;h=aa5e2273ffeab558641f08a0b28a3cd4bf32426b;p=xenclient%2Fbuild.git

XC-1017: Host installer: Fix backwards w/ Escape key
---

diff --git a/target/generic/target_xenclient_installer_skeleton/install/stages/Enable-SSH b/target/generic/target_xenclient_installer_skeleton/install/stages/Enable-SSH
index 6ae8a41..ff4bf9c 100755
--- a/target/generic/target_xenclient_installer_skeleton/install/stages/Enable-SSH
+++ b/target/generic/target_xenclient_installer_skeleton/install/stages/Enable-SSH
@@ -1,14 +1,16 @@
 #!/bin/ash
 
-set -x
 . ${SCRIPT_DIR}/functions
 
 rm -f ${SSH_CONF}
 
 if answerfile_specifies "enable-ssh" ; then
+    not_previous $@ || exit ${Previous}
     SSH_ENABLED=$(read_xml_tag "${ANSWERFILE}" "enable-ssh")
+
 elif ! interactive ; then
     SSH_ENABLED=false
+
 else
     dialog --yes-label "Yes" --no-label "No" --yesno "\n Do you wish to enable the SSH server?" 7 50
 
@@ -17,7 +19,7 @@ else
     if [ "${OPT}" = 0 ] ; then
         SSH_ENABLED=true
     else
-	SSH_ENABLED=false
+        SSH_ENABLED=false
     fi
 fi
 
diff --git a/target/generic/target_xenclient_installer_skeleton/install/stages/Find-existing-install b/target/generic/target_xenclient_installer_skeleton/install/stages/Find-existing-install
index a2838be..32f4f18 100755
--- a/target/generic/target_xenclient_installer_skeleton/install/stages/Find-existing-install
+++ b/target/generic/target_xenclient_installer_skeleton/install/stages/Find-existing-install
@@ -17,6 +17,8 @@ detect_prior_installation()
 }
 
 if answerfile_specifies "mode" ; then
+    not_previous $@ || exit ${Previous}
+
     MODE=$(read_xml_tag "${ANSWERFILE}" "mode")
 
     case "${MODE}" in
diff --git a/target/generic/target_xenclient_installer_skeleton/install/stages/Set-password b/target/generic/target_xenclient_installer_skeleton/install/stages/Set-password
index 3d64aa7..886796c 100755
--- a/target/generic/target_xenclient_installer_skeleton/install/stages/Set-password
+++ b/target/generic/target_xenclient_installer_skeleton/install/stages/Set-password
@@ -3,8 +3,9 @@
 . ${SCRIPT_DIR}/functions
 # ^^^ defines ${PASSWORD_CONF}
 
-
 if answerfile_specifies "password" ; then
+    not_previous $@ || exit ${Previous}
+
     PASSWORD=$(read_xml_tag "${ANSWERFILE}" "password")
 
     # Do not validate. Empty is acceptable.
diff --git a/target/generic/target_xenclient_installer_skeleton/install/stages/sequence.graph b/target/generic/target_xenclient_installer_skeleton/install/stages/sequence.graph
index 5ccc130..32edddd 100644
--- a/target/generic/target_xenclient_installer_skeleton/install/stages/sequence.graph
+++ b/target/generic/target_xenclient_installer_skeleton/install/stages/sequence.graph
@@ -27,7 +27,7 @@ Download-install-files,  Continue:Set-password | BadTransfer:Configure-network-r
 
 Check-initrd-data,       Continue:Set-password | CheckFail:Bad-install-choice | Abort:Fail
 Set-password,            Continue:Enable-SSH | Abort:Fail
-Enable-SSH,		 Continue:Find-existing-install
+Enable-SSH,              Continue:Find-existing-install
 
 Bad-install-choice,      Retry:Choose-install-type | Abort:Fail