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 6ae8a4198d9bc95ee20e90776e9188174a1c2c3a..ff4bf9cb76468c213109a8f21216f5f0e55ed41d 100755 (executable)
--- 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 a2838be20164a365aefc08d3504a891000bff474..32f4f18b095b0aee4ccfe67873055d6af048971e 100755 (executable)
--- 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 3d64aa704028d2a0fce5d1ecc311792caeebb4c7..886796c1d31c1ba1d46059eb729f310492c500b4 100755 (executable)
--- 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 5ccc13043e73d2e5254071a97b3cc0d300453e09..32edddd1b09cda18cee2ca41e5381d2cdbee905e 100644 (file)
--- 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