diff --git a/xCAT-UI/js/custom/hmc.js b/xCAT-UI/js/custom/hmc.js
index e39b5fc92..bb4c5f567 100644
--- a/xCAT-UI/js/custom/hmc.js
+++ b/xCAT-UI/js/custom/hmc.js
@@ -1188,7 +1188,6 @@ function powerInitConfig(operType){
showStr += '
';
showStr += '- Create configure file for xcatsetup.
';
showStr += '- Wrote Objects into xCAT database by xcatsetup.
';
- showStr += '- Configured DHCP.
';
showStr += '
';
$('#discoverContentDiv').append(showStr);
@@ -1292,34 +1291,6 @@ function runSetup(){
var tempSpan = $('#setupLine').find('span');
tempSpan.removeClass('ui-icon-gear');
tempSpan.addClass('ui-icon-check');
- configDHCP();
- }
- });
-}
-/**
- * Step 7: create the dhcp configure file
- *
- * @param
- *
- * @return
- */
-function configDHCP(){
- $('#dhcpLine').append(createLoader());
- $.ajax({
- url : 'lib/cmd.php',
- dataType : 'json',
- data : {
- cmd : 'makedhcp',
- tgt : '',
- args : '-n',
- msg : ''
- },
-
- success : function(){
- $('#dhcpLine img').remove();
- var tempSpan = $('#dhcpLine').find('span');
- tempSpan.removeClass('ui-icon-gear');
- tempSpan.addClass('ui-icon-check');
createDiscoverButtons();
}
});
@@ -1335,12 +1306,20 @@ function configDHCP(){
function powerInitUpdateDefinition(operType){
$('#discoverContentDiv').empty();
$('.tooltip').remove();
+ var iconClass = '';
+ if ('back' == operType){
+ iconClass = 'ui-icon-check';
+ }
+ else{
+ iconClass = 'ui-icon-gear';
+ }
var showStr = '' + steps[currentStep] + '
';
showStr += '
';
- showStr += '- Update Frames into xCAT database.
';
- showStr += '- Discover HMCs.
';
- showStr += '- Update HMCs into xCAT database.
';
- showStr += '- Discover CECs and update into xCAT database.
';
+ showStr += '- Update Frames into xCAT database.
';
+ showStr += '- Discover HMCs.
';
+ showStr += '- Update HMCs into xCAT database.
';
+ showStr += '- Discover CECs and update into xCAT database.
';
+ showStr += '- Configured DHCP.
';
showStr += '
';
$('#discoverContentDiv').append(showStr);
@@ -1492,6 +1471,35 @@ function lsslpWriteCec(){
var tempSpan = $('#cecLine').find('span');
tempSpan.removeClass('ui-icon-gear');
tempSpan.addClass('ui-icon-check');
+ configDHCP();
+ }
+ });
+}
+
+/**
+ * Step 8: create the dhcp configure file
+ *
+ * @param
+ *
+ * @return
+ */
+function configDHCP(){
+ $('#dhcpLine').append(createLoader());
+ $.ajax({
+ url : 'lib/cmd.php',
+ dataType : 'json',
+ data : {
+ cmd : 'makedhcp',
+ tgt : '',
+ args : '-n',
+ msg : ''
+ },
+
+ success : function(){
+ $('#dhcpLine img').remove();
+ var tempSpan = $('#dhcpLine').find('span');
+ tempSpan.removeClass('ui-icon-gear');
+ tempSpan.addClass('ui-icon-check');
createDiscoverButtons();
}
});