Splitting centos & rhel script, done in 538ca137c, was not exactly the best idea as it increased the maintenance for pretty much no gain. With that in mind, let's merge back the scripts keeping the centos specific bits conditionally added as part of the templates. Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx> --- .../centos-kickstart-desktop.xml.in | 240 ------------------ .../centos.org/centos-kickstart-jeos.xml.in | 168 ------------ .../redhat.com/rhel-kickstart-desktop.xml.in | 50 +++- .../redhat.com/rhel-kickstart-jeos.xml.in | 57 ++++- data/os/centos.org/centos-6.0.xml.in | 4 +- data/os/centos.org/centos-6.1.xml.in | 4 +- data/os/centos.org/centos-6.10.xml.in | 4 +- data/os/centos.org/centos-6.2.xml.in | 4 +- data/os/centos.org/centos-6.3.xml.in | 4 +- data/os/centos.org/centos-6.4.xml.in | 4 +- data/os/centos.org/centos-6.5.xml.in | 4 +- data/os/centos.org/centos-6.6.xml.in | 4 +- data/os/centos.org/centos-6.7.xml.in | 4 +- data/os/centos.org/centos-6.8.xml.in | 4 +- data/os/centos.org/centos-6.9.xml.in | 4 +- data/os/centos.org/centos-7.0.xml.in | 4 +- 16 files changed, 108 insertions(+), 455 deletions(-) delete mode 100644 data/install-script/centos.org/centos-kickstart-desktop.xml.in delete mode 100644 data/install-script/centos.org/centos-kickstart-jeos.xml.in diff --git a/data/install-script/centos.org/centos-kickstart-desktop.xml.in b/data/install-script/centos.org/centos-kickstart-desktop.xml.in deleted file mode 100644 index 427a124..0000000 --- a/data/install-script/centos.org/centos-kickstart-desktop.xml.in +++ /dev/null @@ -1,240 +0,0 @@ -<libosinfo version="0.0.1"> -<!-- Licensed under the GNU General Public License version 2 or later. - See http://www.gnu.org/licenses/ for a copy of the license text --> - <install-script id='http://centos.org/centos/kickstart/desktop'> - <profile>desktop</profile> - <expected-filename>centos.ks</expected-filename> - <config> - <param name="l10n-keyboard" policy="optional"/> - <param name="l10n-language" policy="optional"/> - <param name="l10n-timezone" policy="optional"/> - <param name="hostname" policy="optional"/> - <param name="user-login" policy="required"/> - <param name="user-password" policy="optional"/> - <param name="admin-password" policy="optional"/> - <param name="avatar-location" policy="optional"/> - <param name="avatar-disk" policy="optional"/> - <param name="target-disk" policy="optional"/> - <param name="script-disk" policy="optional"/> - </config> - <injection-method>cdrom</injection-method> - <injection-method>disk</injection-method> - <injection-method>floppy</injection-method> - <injection-method>initrd</injection-method> - <avatar-format> - <mime-type>image/png</mime-type> - </avatar-format> - <template> - <xsl:stylesheet - xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; - version="1.0"> - - <xsl:output method="text"/> - - <xsl:template name="target-disk"> - <xsl:choose> - <xsl:when test="config/target-disk != ''"> - <xsl:value-of select="config/target-disk"/> - </xsl:when> - <xsl:when test="os/version > 5.5"> - <!-- virtio --> - <xsl:text>/dev/vda</xsl:text> - </xsl:when> - <xsl:otherwise> - <!-- IDE --> - <xsl:text>/dev/sda</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template name="script-disk"> - <xsl:variable name="script-disk"> - <xsl:choose> - <xsl:when test="config/script-disk != ''"> - <xsl:value-of select="config/script-disk"/> - </xsl:when> - <xsl:when test="os/version > 5.5"> - <xsl:text>/dev/sda</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>/dev/sdb</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:value-of select="substring-after($script-disk, '/dev/')"/> - </xsl:template> - - <!-- The default values of avatar-disk consider the avatar is stored - in the same disk as the installation scripts. --> - <xsl:template name="avatar-disk"> - <xsl:choose> - <xsl:when test="config/avatar-disk != ''"> - <xsl:value-of select="config/avatar-disk"/> - </xsl:when> - <xsl:when test="os/version > 5.5"> - <xsl:text>/dev/sda</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>/dev/sdb</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template match="/command-line"> - <xsl:text>ks=</xsl:text> - <xsl:choose> - <xsl:when test="script/preferred-injection-method = 'initrd'"> - <xsl:text>file:/</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>hd:</xsl:text> - <xsl:call-template name="script-disk"/> - <xsl:text>:/</xsl:text> - </xsl:otherwise> - </xsl:choose> - <xsl:value-of select="script/expected-filename"/> - <xsl:if test="script/installation-source = 'network'"> - <xsl:choose> - <xsl:when test="os/version < 7"> - <xsl:text> method=</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text> inst.repo=</xsl:text> - </xsl:otherwise> - </xsl:choose> - <xsl:call-template name="installation-url"/> - </xsl:if> - </xsl:template> - - <xsl:template name="version"> - <xsl:choose> - <xsl:when test="os/version < 7"> - <xsl:text>6</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>7</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template name="arch"> - <xsl:choose> - <xsl:when test="config/hardware-arch = 'x86_64'"> - <xsl:text>x86_64</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>i386</xsl:text> - </xsl:otherwise> - </xsl:choose> - </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:when test="tree/url != ''"> - <xsl:value-of select="tree/url"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>http://mirror.centos.org/centos/</xsl:text> - <xsl:call-template name="version"/> - <xsl:text>/os/</xsl:text> - <xsl:call-template name="arch"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <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 <xsl:value-of select="config/l10n-keyboard"/> -lang <xsl:value-of select="config/l10n-language"/> -network --onboot yes --bootproto dhcp --noipv6 --hostname=<xsl:value-of select="config/hostname"/> -rootpw dummyPa55w0rd # Actual password set (or unset) in %post below -firewall --disabled -authconfig --enableshadow --enablemd5 -timezone --utc <xsl:value-of select="config/l10n-timezone"/> -bootloader --location=mbr -zerombr - -clearpart --all --drives=<xsl:call-template name="target-disk"/> - -firstboot --disable - -autopart -reboot - -<xsl:if test="script/installation-source = 'network'"> -url --url=<xsl:call-template name="installation-url"/> -</xsl:if> - -%packages -@core -@x11 -<xsl:choose> - <xsl:when test="os/version < 7"> -@basic-desktop -@general-desktop -@desktop-platform - </xsl:when> - <xsl:otherwise> -@gnome-desktop -@multimedia - </xsl:otherwise> -</xsl:choose> -@internet-browser -@input-methods - -qemu-guest-agent - -%end - -%post --erroronfail - -useradd -G wheel <xsl:value-of select="config/user-login"/> # Add user -if test -z '<xsl:value-of select="config/user-password"/>'; then - passwd -d <xsl:value-of select="config/user-login"/> # Make user account passwordless -else - echo '<xsl:value-of select="config/user-password"/>' |passwd --stdin <xsl:value-of select="config/user-login"/> -fi - -if test -z '<xsl:value-of select="config/admin-password"/>'; then - passwd -d root # Make root account passwordless -else - echo '<xsl:value-of select="config/admin-password"/>' |passwd --stdin root -fi - -# Set user avatar -if test -n '<xsl:value-of select="config/avatar-location"/>'; then -mkdir /mnt/unattended-media -mount <xsl:call-template name="avatar-disk"/> /mnt/unattended-media -cp /mnt/unattended-media<xsl:value-of select="config/avatar-location"/> /home/<xsl:value-of select="config/user-login"/>/.face -umount /mnt/unattended-media -fi - -# Enable autologin -echo "[daemon] -AutomaticLoginEnable=true -AutomaticLogin=<xsl:value-of select="config/user-login"/> - -[security] - -[xdmcp] - -[greeter] - -[chooser] - -[debug] -" > /etc/gdm/custom.conf - -%end - </xsl:template> - </xsl:stylesheet> - </template> - </install-script> -</libosinfo> diff --git a/data/install-script/centos.org/centos-kickstart-jeos.xml.in b/data/install-script/centos.org/centos-kickstart-jeos.xml.in deleted file mode 100644 index d306ba8..0000000 --- a/data/install-script/centos.org/centos-kickstart-jeos.xml.in +++ /dev/null @@ -1,168 +0,0 @@ -<libosinfo version="0.0.1"> -<!-- Licensed under the GNU General Public License version 2 or later. - See http://www.gnu.org/licenses/ for a copy of the license text --> - <install-script id='http://centos.org/centos/kickstart/jeos'> - <profile>jeos</profile> - <expected-filename>centos.ks</expected-filename> - <config> - <param name="admin-password" policy="required"/> - <param name="l10n-keyboard" policy="optional"/> - <param name="l10n-language" policy="optional"/> - <param name="l10n-timezone" policy="optional"/> - <param name="target-disk" policy="optional"/> - <param name="script-disk" policy="optional"/> - </config> - <injection-method>cdrom</injection-method> - <injection-method>disk</injection-method> - <injection-method>floppy</injection-method> - <injection-method>initrd</injection-method> - <template> - <xsl:stylesheet - xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; - version="1.0"> - - <xsl:output method="text"/> - - <xsl:template name="target-disk"> - <xsl:choose> - <xsl:when test="config/target-disk != ''"> - <xsl:value-of select="config/target-disk"/> - </xsl:when> - <xsl:when test="os/version > 5.5"> - <!-- virtio --> - <xsl:text>/dev/vda</xsl:text> - </xsl:when> - <xsl:otherwise> - <!-- IDE --> - <xsl:text>/dev/sda</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template name="script-disk"> - <xsl:variable name="script-disk"> - <xsl:choose> - <xsl:when test="config/script-disk != ''"> - <xsl:value-of select="config/script-disk"/> - </xsl:when> - <xsl:when test="os/version > 5.5"> - <xsl:text>/dev/sda</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>/dev/sdb</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:variable> - <xsl:value-of select="substring-after($script-disk, '/dev/')"/> - </xsl:template> - - <xsl:template match="/command-line"> - <xsl:text>ks=</xsl:text> - <xsl:choose> - <xsl:when test="script/preferred-injection-method = 'initrd'"> - <xsl:text>file:/</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>hd:</xsl:text> - <xsl:call-template name="script-disk"/> - <xsl:text>:/</xsl:text> - </xsl:otherwise> - </xsl:choose> - <xsl:value-of select="script/expected-filename"/> - <xsl:if test="script/installation-source = 'network'"> - <xsl:choose> - <xsl:when test="os/version < 7"> - <xsl:text> method=</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text> inst.repo=</xsl:text> - </xsl:otherwise> - </xsl:choose> - <xsl:call-template name="installation-url"/> - </xsl:if> - </xsl:template> - - <xsl:template name="version"> - <xsl:choose> - <xsl:when test="os/version < 7"> - <xsl:text>6</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>7</xsl:text> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template name="arch"> - <xsl:choose> - <xsl:when test="config/hardware-arch = 'x86_64'"> - <xsl:text>x86_64</xsl:text> - </xsl:when> - <xsl:otherwise> - <xsl:text>i386</xsl:text> - </xsl:otherwise> - </xsl:choose> - </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:when test="tree/url != ''"> - <xsl:value-of select="tree/url"/> - </xsl:when> - <xsl:otherwise> - <xsl:text>http://mirror.centos.org/centos/</xsl:text> - <xsl:call-template name="version"/> - <xsl:text>/os/</xsl:text> - <xsl:call-template name="arch"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <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 -keyboard <xsl:value-of select="config/l10n-keyboard"/> -lang <xsl:value-of select="config/l10n-language"/> -skipx -network --bootproto dhcp -rootpw <xsl:value-of select="config/admin-password"/> -firewall --disabled -authconfig --enableshadow --enablemd5 -selinux --enforcing -timezone --utc <xsl:value-of select="config/l10n-timezone"/> -bootloader --location=mbr -zerombr - -clearpart --all --drives=<xsl:call-template name="target-disk"/> - -autopart -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"> -@base - </xsl:when> - <xsl:otherwise> -@^minimal - </xsl:otherwise> -</xsl:choose> -@core - -%end - </xsl:template> - </xsl:stylesheet> - </template> - </install-script> -</libosinfo> 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 8353929..221a2c9 100644 --- a/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-desktop.xml.in @@ -80,17 +80,6 @@ </xsl:choose> </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=</xsl:text> <xsl:choose> @@ -117,6 +106,45 @@ </xsl:if> </xsl:template> + <xsl:template name="version"> + <xsl:choose> + <xsl:when test="os/version < 7"> + <xsl:text>6</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>7</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template name="arch"> + <xsl:choose> + <xsl:when test="config/hardware-arch = 'x86_64'"> + <xsl:text>x86_64</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>i386</xsl:text> + </xsl:otherwise> + </xsl:choose> + </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:when test="tree/url != ''"> + <xsl:value-of select="tree/url"/> + </xsl:when> + <xsl:when test="os/distro = centos"> + <xsl:text>http://mirror.centos.org/centos/</xsl:text> + <xsl:call-template name="version"/> + <xsl:text>/os/</xsl:text> + <xsl:call-template name="arch"/> + </xsl:when> + </xsl:choose> + </xsl:template> + <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'"> 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 790794c..7ad1290 100644 --- a/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in +++ b/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in @@ -56,17 +56,6 @@ <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=</xsl:text> <xsl:choose> @@ -93,6 +82,45 @@ </xsl:if> </xsl:template> + <xsl:template name="version"> + <xsl:choose> + <xsl:when test="os/version < 7"> + <xsl:text>6</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>7</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + + <xsl:template name="arch"> + <xsl:choose> + <xsl:when test="config/hardware-arch = 'x86_64'"> + <xsl:text>x86_64</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>i386</xsl:text> + </xsl:otherwise> + </xsl:choose> + </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:when test="tree/url != ''"> + <xsl:value-of select="tree/url"/> + </xsl:when> + <xsl:when test="os/distro = centos"> + <xsl:text>http://mirror.centos.org/centos/</xsl:text> + <xsl:call-template name="version"/> + <xsl:text>/os/</xsl:text> + <xsl:call-template name="arch"/> + </xsl:when> + </xsl:choose> + </xsl:template> + <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'"> @@ -129,7 +157,12 @@ url --url=<xsl:call-template name="installation-url"/> @base </xsl:when> <xsl:otherwise> -@standard + <xsl:when test="os/distro = centos"> + @^minimal + </xsl:when> + <xsl:otherwise> + @standard + </xsl:otherwise> </xsl:otherwise> </xsl:choose> @core diff --git a/data/os/centos.org/centos-6.0.xml.in b/data/os/centos.org/centos-6.0.xml.in index eb4e847..e112021 100644 --- a/data/os/centos.org/centos-6.0.xml.in +++ b/data/os/centos.org/centos-6.0.xml.in @@ -63,8 +63,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> diff --git a/data/os/centos.org/centos-6.1.xml.in b/data/os/centos.org/centos-6.1.xml.in index 1036044..d12b6b4 100644 --- a/data/os/centos.org/centos-6.1.xml.in +++ b/data/os/centos.org/centos-6.1.xml.in @@ -62,8 +62,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> diff --git a/data/os/centos.org/centos-6.10.xml.in b/data/os/centos.org/centos-6.10.xml.in index 04378a7..c64f7e2 100644 --- a/data/os/centos.org/centos-6.10.xml.in +++ b/data/os/centos.org/centos-6.10.xml.in @@ -125,8 +125,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> diff --git a/data/os/centos.org/centos-6.2.xml.in b/data/os/centos.org/centos-6.2.xml.in index b4c1db9..d0e9911 100644 --- a/data/os/centos.org/centos-6.2.xml.in +++ b/data/os/centos.org/centos-6.2.xml.in @@ -62,8 +62,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> diff --git a/data/os/centos.org/centos-6.3.xml.in b/data/os/centos.org/centos-6.3.xml.in index 9816d23..04ab0d8 100644 --- a/data/os/centos.org/centos-6.3.xml.in +++ b/data/os/centos.org/centos-6.3.xml.in @@ -70,8 +70,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> diff --git a/data/os/centos.org/centos-6.4.xml.in b/data/os/centos.org/centos-6.4.xml.in index 2a0386e..ac3fadf 100644 --- a/data/os/centos.org/centos-6.4.xml.in +++ b/data/os/centos.org/centos-6.4.xml.in @@ -62,8 +62,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> diff --git a/data/os/centos.org/centos-6.5.xml.in b/data/os/centos.org/centos-6.5.xml.in index f6a8897..ef78ba1 100644 --- a/data/os/centos.org/centos-6.5.xml.in +++ b/data/os/centos.org/centos-6.5.xml.in @@ -62,8 +62,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> diff --git a/data/os/centos.org/centos-6.6.xml.in b/data/os/centos.org/centos-6.6.xml.in index 5ba5172..c410182 100644 --- a/data/os/centos.org/centos-6.6.xml.in +++ b/data/os/centos.org/centos-6.6.xml.in @@ -105,8 +105,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> diff --git a/data/os/centos.org/centos-6.7.xml.in b/data/os/centos.org/centos-6.7.xml.in index d9dc4c0..97b2aef 100644 --- a/data/os/centos.org/centos-6.7.xml.in +++ b/data/os/centos.org/centos-6.7.xml.in @@ -141,8 +141,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> diff --git a/data/os/centos.org/centos-6.8.xml.in b/data/os/centos.org/centos-6.8.xml.in index 284f843..a714d30 100644 --- a/data/os/centos.org/centos-6.8.xml.in +++ b/data/os/centos.org/centos-6.8.xml.in @@ -143,8 +143,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> diff --git a/data/os/centos.org/centos-6.9.xml.in b/data/os/centos.org/centos-6.9.xml.in index a586eb6..ef19209 100644 --- a/data/os/centos.org/centos-6.9.xml.in +++ b/data/os/centos.org/centos-6.9.xml.in @@ -125,8 +125,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> diff --git a/data/os/centos.org/centos-7.0.xml.in b/data/os/centos.org/centos-7.0.xml.in index 7c07595..3617d36 100644 --- a/data/os/centos.org/centos-7.0.xml.in +++ b/data/os/centos.org/centos-7.0.xml.in @@ -87,8 +87,8 @@ </resources> <installer> - <script id='http://centos.org/centos/kickstart/jeos'/> - <script id='http://centos.org/centos/kickstart/desktop'/> + <script id='http://redhat.com/rhel/kickstart/jeos'/> + <script id='http://redhat.com/rhel/kickstart/desktop'/> </installer> </os> </libosinfo> -- 2.21.0 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo
