From 427d482261545c752c860c9365cec71a49e81364 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 4 Jun 2013 07:54:52 +0000
Subject: [PATCH] service node pool supports for sles

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16529 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/perl/xCAT/Template.pm                   | 1 +
 xCAT-server/share/xcat/install/scripts/pre.sles         | 4 ++++
 xCAT-server/share/xcat/install/sles/compute.sles11.tmpl | 5 -----
 xCAT-server/share/xcat/install/sles/compute.tmpl        | 6 ------
 xCAT-server/share/xcat/install/sles/service.sles11.tmpl | 5 -----
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 0e36cc8b8..5981f1050 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -197,6 +197,7 @@ sub subvars {
            <ask_on_error config:type=\"boolean\">false</ask_on_error> <!-- available since openSUSE 11.0 -->
            <name>SuSE-Linux-pkg$c</name> <!-- available since openSUSE 11.1/SLES11 (bnc#433981) -->
          </listentry>";
+           $source_in_pre .="<listentry><media_url>http://'\$nextserver'$pkgdir</media_url><product>SuSE-Linux-pkg$c</product><product_dir>/</product_dir><ask_on_error config:type=\"boolean\">false</ask_on_error><name>SuSE-Linux-pkg$c</name></listentry>";
           }
           $c++;
       }
diff --git a/xCAT-server/share/xcat/install/scripts/pre.sles b/xCAT-server/share/xcat/install/scripts/pre.sles
index 51579f8a8..055fcd393 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.sles
+++ b/xCAT-server/share/xcat/install/scripts/pre.sles
@@ -170,6 +170,10 @@ if [ -r "/tmp/partitionfile" ]; then
     sed -e '/<drive>/{N;N;s!.*!'$con'!}' /tmp/profile/autoinst.xml > /tmp/profile/modified1.xml
     sed -e 's!xcattempspace! !g' /tmp/profile/modified1.xml > /tmp/profile/modified.xml
 fi
+
+export nextserver=`cat /proc/cmdline | grep http | head -n 1 | cut -d / -f 3 | cut -d : -f 1`
+cp /tmp/profile/modified.xml /tmp/profile/modified1.xml
+sed -e 's!<software>!<add-on><add_on_products config:type="list">#INSTALL_SOURCES_IN_PRE#</add_on_products></add-on><software>!'  /tmp/profile/modified1.xml > /tmp/profile/modified.xml
 ]]>
 
           </source>
diff --git a/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl
index 684e1a514..64819cafa 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl
@@ -35,11 +35,6 @@
       </signature-handling>
 
     </general>
-    <add-on>
-       <add_on_products config:type="list">
-           #INSTALL_SOURCES#
-       </add_on_products>
-    </add-on>
     <partitioning config:type="list">
       <!-- XCAT-PARTITION-START -->
       <drive>
diff --git a/xCAT-server/share/xcat/install/sles/compute.tmpl b/xCAT-server/share/xcat/install/sles/compute.tmpl
index c2644cbac..53e0e7df4 100644
--- a/xCAT-server/share/xcat/install/sles/compute.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.tmpl
@@ -34,12 +34,6 @@
          <accept_unsigned_file config:type="boolean">true</accept_unsigned_file>
       </signature-handling>
     </general>
-    <add-on>
-       <add_on_products config:type="list">
-           #INSTALL_SOURCES#
-       </add_on_products>
-    </add-on>
-
     <partitioning config:type="list">
       <!-- XCAT-PARTITION-START -->
       <drive>
diff --git a/xCAT-server/share/xcat/install/sles/service.sles11.tmpl b/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
index fdcaffa8d..21df8ef8f 100644
--- a/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
+++ b/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
@@ -35,11 +35,6 @@
       </signature-handling>
 
     </general>
-    <add-on>
-       <add_on_products config:type="list">
-           #INSTALL_SOURCES#
-       </add_on_products>
-    </add-on>
     <partitioning config:type="list">
       <!-- XCAT-PARTITION-START -->
       <drive>