diff --git a/xCAT-nbroot/overlay/bin/bmcsetup b/xCAT-nbroot/overlay/bin/bmcsetup
index 05245506f..99369e2e0 100755
--- a/xCAT-nbroot/overlay/bin/bmcsetup
+++ b/xCAT-nbroot/overlay/bin/bmcsetup
@@ -38,6 +38,6 @@ echo "Enabling IPMI v 1.5 MD5 LAN access:"
 ipmitool lan set 1 auth admin md5
 
 echo "Enabling IPMI v 2.0 LAN access:"
-ipmitool lan set 1 cipher_privs uuaaXXXXXXXXXXX
+ipmitool lan set 1 cipher_privs uaaaXXXXXXXXXXX
 
 
diff --git a/xCAT-nbroot/overlay/etc/init.d/S10autodetect b/xCAT-nbroot/overlay/etc/init.d/S10autodetect
index 129a31604..7111c8da3 100755
--- a/xCAT-nbroot/overlay/etc/init.d/S10autodetect
+++ b/xCAT-nbroot/overlay/etc/init.d/S10autodetect
@@ -46,12 +46,12 @@ do
                 else
 		    modprobe $MOD
 		    udhcpc -i eth$nic -b
-                    nic=$(($nic + 1))
          let extrat=0
          until ifconfig eth$nic|grep "inet addr" || [ $extrat == 30 ]; do
              sleep 1
              let extrat=extrat+1
          done
+                    nic=$(($nic + 1))
                 fi
                 ;;
             scsi|raid)
@@ -72,12 +72,12 @@ if [ -d /proc/device-tree/vdevice/l-lan* ]; then
 	modprobe ibmveth
         for i in /sys/bus/vio/drivers/ibmveth/*/net*; do
     	    udhcpc -i eth$nic -b
-            nic=$(($nic + 1))
          let extrat=0
          until ifconfig eth$nic|grep "inet addr" || [ $extrat == 30 ]; do
              sleep 1
              let extrat=extrat+1
          done
+            nic=$(($nic + 1))
 	done
 fi
 	
@@ -85,12 +85,12 @@ if [ -d /proc/device-tree/lhea* ]; then
 		    modprobe ehea
             for i in /sys/bus/ibmebus/devices/port*; do
     		    udhcpc -i eth$nic -b
-                nic=$(($nic + 1))
          let extrat=0
          until ifconfig eth$nic|grep "inet addr" || [ $extrat == 30 ]; do
              sleep 1
              let extrat=extrat+1
          done
+                nic=$(($nic + 1))
             done
 fi