From 84daa2e95de5a252c16a9f1d50bee9984ca52b14 Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 25 Aug 2010 16:36:49 +0000
Subject: [PATCH] Removed #INCLUDE* variables from templates because s390x does
 not use mkinstall command to prepare the templates.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7234 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../share/xcat/install/sles/compute.sles10.s390x.tmpl      | 7 +++----
 .../share/xcat/install/sles/compute.sles11.s390x.tmpl      | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl
index fe3bc2fc9..1c0a608b9 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl
@@ -539,11 +539,10 @@
   <!-- Software to install on Linux -->
   <software>
     <patterns config:type="list">
-      #INCLUDE_DEFAULT_PTRNLIST_S#
+      <pattern>base</pattern>
+      <pattern>x11</pattern>
+      <pattern>gnome</pattern>
     </patterns>
-    <packages config:type="list">
-      #INCLUDE_DEFAULT_PKGLIST_S#
-    </packages>
   </software>
   
   
diff --git a/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl
index f835b9fe3..1c0a608b9 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl
@@ -539,11 +539,10 @@
   <!-- Software to install on Linux -->
   <software>
     <patterns config:type="list">
-        #INCLUDE_DEFAULT_PTRNLIST_S#
+      <pattern>base</pattern>
+      <pattern>x11</pattern>
+      <pattern>gnome</pattern>
     </patterns>
-    <packages config:type="list">
-      #INCLUDE_DEFAULT_PKGLIST_S#
-    </packages>
   </software>