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