Blame SOURCES/install-script-rhel-Fix-for-Server-7.0.patch

5ae075
From 0403a05d466e8c24ee721a9541e8b4a322b58125 Mon Sep 17 00:00:00 2001
5ae075
From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
5ae075
Date: Fri, 22 Nov 2013 13:35:21 +0000
5ae075
Subject: [PATCH 2/2] install-script,rhel: Fix for 'Server' & 7.0
5ae075
5ae075
---
5ae075
 data/install-scripts/rhel.xml | 12 ++++++++++--
5ae075
 1 file changed, 10 insertions(+), 2 deletions(-)
5ae075
5ae075
diff --git a/data/install-scripts/rhel.xml b/data/install-scripts/rhel.xml
5ae075
index 980814b..840344b 100644
5ae075
--- a/data/install-scripts/rhel.xml
5ae075
+++ b/data/install-scripts/rhel.xml
5ae075
@@ -51,6 +51,7 @@
5ae075
         <xsl:template match="/install-script-config">
5ae075
 # Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
5ae075
 install
5ae075
+cdrom
5ae075
 text
5ae075
 
5ae075
             mapping from language to console layout. -->
5ae075
@@ -152,6 +153,7 @@ reboot
5ae075
         <xsl:template match="/install-script-config">
5ae075
 # Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/>
5ae075
 install
5ae075
+cdrom
5ae075
 keyboard us
5ae075
 lang <xsl:value-of select="config/l10n-language"/>
5ae075
 network --onboot yes --device eth0 --bootproto dhcp --noipv6 --hostname=<xsl:value-of select="config/hostname"/>
5ae075
@@ -176,13 +178,19 @@ reboot
5ae075
 %packages
5ae075
 @core
5ae075
 @x11
5ae075
+<xsl:choose>
5ae075
+  <xsl:when test="os/version < 7">
5ae075
 @basic-desktop
5ae075
 @general-desktop
5ae075
 @desktop-platform
5ae075
-@internet-applications
5ae075
+  </xsl:when>
5ae075
+  <xsl:otherwise>
5ae075
+@gnome-desktop
5ae075
+@multimedia
5ae075
+  </xsl:otherwise>
5ae075
+</xsl:choose>
5ae075
 @internet-browser
5ae075
 @input-methods
5ae075
-@office-suite
5ae075
 
5ae075
 %end
5ae075
 
5ae075
-- 
5ae075
1.8.4.2
5ae075