From dd7d473d49fa681c7e0fd640e20c5a770898ba88 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 1 Mar 2013 09:12:20 +0000
Subject: [PATCH] support multiple paths of osimage in sles diskfull
 installation

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15324 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../share/xcat/install/sles/compute.sles11.tmpl     | 11 +++++++++++
 xCAT-server/share/xcat/install/sles/compute.tmpl    | 13 ++++++++++++-
 .../share/xcat/install/sles/service.sles11.tmpl     | 11 +++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl
index cad5c720e..684e1a514 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl
@@ -28,7 +28,18 @@
       <mouse>
         <id>non</id>
       </mouse>
+      <signature-handling>
+         <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key>
+         <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key>
+         <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/compute.tmpl b/xCAT-server/share/xcat/install/sles/compute.tmpl
index 8f65c5276..c2644cbac 100644
--- a/xCAT-server/share/xcat/install/sles/compute.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.tmpl
@@ -28,11 +28,22 @@
       <mouse>
         <id>non</id>
       </mouse>
+      <signature-handling>
+         <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key>
+         <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key>
+         <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>
-        <device>/dev/sda</device>
+        <device>XCATPARTITIONHOOK</device>
         <initialize config:type="boolean">true</initialize>
         <use>all</use>
       </drive>
diff --git a/xCAT-server/share/xcat/install/sles/service.sles11.tmpl b/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
index f6dea6e3e..fdcaffa8d 100644
--- a/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
+++ b/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
@@ -28,7 +28,18 @@
       <mouse>
         <id>non</id>
       </mouse>
+      <signature-handling>
+         <accept_non_trusted_gpg_key config:type="boolean">true</accept_non_trusted_gpg_key>
+         <accept_unknown_gpg_key config:type="boolean">true</accept_unknown_gpg_key>
+         <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>