From 428058af5a2885f8dd8ba01460743cf3440114d0 Mon Sep 17 00:00:00 2001
From: jjhua <jinjhua@cn.ibm.com>
Date: Mon, 28 Oct 2013 11:02:30 -0400
Subject: [PATCH 1/4] move setup_openstack_repo from xCAT/postscripts/ to
 xCAT-OpenStack/postscripts, and it will be packed into xCAT-OpenStack package

---
 {xCAT => xCAT-OpenStack}/postscripts/setup_openstack_repo | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {xCAT => xCAT-OpenStack}/postscripts/setup_openstack_repo (100%)

diff --git a/xCAT/postscripts/setup_openstack_repo b/xCAT-OpenStack/postscripts/setup_openstack_repo
similarity index 100%
rename from xCAT/postscripts/setup_openstack_repo
rename to xCAT-OpenStack/postscripts/setup_openstack_repo

From 0c7e33c045569bc5a08abc5f34fa4ff110a7fac0 Mon Sep 17 00:00:00 2001
From: yinle <yinle@cn.ibm.com>
Date: Mon, 28 Oct 2013 06:28:45 -0700
Subject: [PATCH 2/4] Add check in configeth to give message to AIX user.

---
 xCAT/postscripts/configeth | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth
index 356dbb872..d66ec3d15 100755
--- a/xCAT/postscripts/configeth
+++ b/xCAT/postscripts/configeth
@@ -314,6 +314,10 @@ if [ "$str_os_type" = "linux" ];then
         str_os_type="redhat"
         str_cfg_dir="/etc/sysconfig/network-scripts/"
     fi
+else
+    echo "configeth dose not support AIX in this build"
+    exit 0
+
 fi
 
 logger -t xcat -p local4.err "configeth: os type: $str_os_type"

From 8ecf88438cbb338a3ac2129c9eab1bd2be7101d6 Mon Sep 17 00:00:00 2001
From: yinle <yinle@cn.ibm.com>
Date: Mon, 28 Oct 2013 06:33:44 -0700
Subject: [PATCH 3/4] Add check in confignics to give message to AIX user.

---
 xCAT/postscripts/confignics | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xCAT/postscripts/confignics b/xCAT/postscripts/confignics
index f523d9b1c..37fe95bd8 100755
--- a/xCAT/postscripts/confignics
+++ b/xCAT/postscripts/confignics
@@ -45,6 +45,11 @@ bool_cfg_inst_nic=0
 str_inst_nic=''
 str_ib_nics=''
 str_os_type=`uname | tr 'A-Z' 'a-z'`
+if [ "$str_os_type" = "aix" ];then
+    logger -t xcat -p local4.err "confignics: aix does not support in this build"
+    echo "confignics: aix does not support in this build"
+    exit 0
+fi
 bool_remove=0
 num_iba_ports=
 str_all_nics=''

From 3be3d26ac392e24cf0420658dd2c5c58a613d7d4 Mon Sep 17 00:00:00 2001
From: yinle <yinle@cn.ibm.com>
Date: Mon, 28 Oct 2013 07:27:29 -0700
Subject: [PATCH 4/4] Add lsslp support for IMM2.

---
 xCAT-server/lib/xcat/plugins/lsslp.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm
index a6b3db461..74e66424e 100644
--- a/xCAT-server/lib/xcat/plugins/lsslp.pm
+++ b/xCAT-server/lib/xcat/plugins/lsslp.pm
@@ -525,7 +525,7 @@ sub invoke_dodiscover {
     if ($globalopt{service}) {
         $services = $globalopt{service};
     } else {
-        $services = [WILDCARD_SERVICE,HARDWARE_SERVICE,SOFTWARE_SERVICE];
+        $services = [WILDCARD_SERVICE,HARDWARE_SERVICE,SOFTWARE_SERVICE,SERVICE_IMM2];
     }
 	#efix for hmc bug
 	if ($services  =~ /hardware-management-console/)  {
@@ -1421,7 +1421,6 @@ sub xCATdB {
         my $hidden = ($type =~ /bpa|fsp/)? 1:0;
         my $groups = lc($type).",all";
         my $tmp_pre = xCAT::data::ibmhwtypes::parse_group($model);
-       
         if (defined($tmp_pre)) {
             $groups .= ",$tmp_pre";
         }
@@ -1504,7 +1503,6 @@ sub format_stanza {
         if (defined($tmp_pre)) {
             $groups .= ",$tmp_pre";
         }
-	
 
         #################################
         # Node attributes
@@ -2099,3 +2097,5 @@ sub bt_handle_new_slp_entity {
 	$btresult{$mac} = $data;
 }
 1;
+
+