Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx> --- .../redhat.com/rhel-kickstart-desktop.xml.in | 17 +++++++++++++++++ .../redhat.com/rhel-kickstart-jeos.xml.in | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in index e2349d2..b68c79e 100644 --- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in @@ -53,6 +53,17 @@ <xsl:value-of select="substring-after($script-disk, '/dev/')"/> </xsl:template> + <xsl:template name="installation-url"> + <xsl:choose> + <xsl:when test="config/installation-url != ''"> + <xsl:value-of select="config/installation-url"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="tree/url"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + <xsl:template match="/command-line"> <xsl:text>ks=hd:</xsl:text> <xsl:call-template name="script-disk"/> @@ -62,8 +73,10 @@ <xsl:template match="/install-script-config"> # Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/> +<xsl:if test="script/installation-source = 'media'"> install cdrom +</xsl:if> keyboard us lang <xsl:value-of select="config/l10n-language"/> network --onboot yes --bootproto dhcp --noipv6 --hostname=<xsl:value-of select="config/hostname"/> @@ -92,6 +105,10 @@ logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow reboot +<xsl:if test="script/installation-source = 'network'"> +url --url=<xsl:call-template name="installation-url"/> +</xsl:if> + %packages @core @x11 diff --git a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in index 8c0b42d..dc23d2a 100644 --- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in @@ -45,6 +45,17 @@ <xsl:value-of select="substring-after($script-disk, '/dev/')"/> </xsl:template> + <xsl:template name="installation-url"> + <xsl:choose> + <xsl:when test="config/installation-url != ''"> + <xsl:value-of select="config/installation-url"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="tree/url"/> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + <xsl:template match="/command-line"> <xsl:text>ks=hd:</xsl:text> <xsl:call-template name="script-disk"/> @@ -54,8 +65,10 @@ <xsl:template match="/install-script-config"> # Install script for <xsl:value-of select="os/short-id"/> profile <xsl:value-of select="script/profile"/> +<xsl:if test="script/installation-source = 'media'"> install cdrom +</xsl:if> 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. --> @@ -88,6 +101,10 @@ logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow reboot +<xsl:if test="script/installation-source = 'network'"> +url --url=<xsl:call-template name="installation-url"/> +</xsl:if> + %packages <xsl:choose> <xsl:when test="os/version < 7"> -- 2.20.1 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo