[Libosinfo] [libosinfo PATCH 4/4] centos, kickstart: Use autopart when possible

[Fabiano Fidêncio]

Let's take advantage of "autopart" and stop setting up the partitions
manually.

autopart is available since RHEL-6 according to its documentation:
https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/html/installation_guide/s1-kickstart2-options

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 .../centos.org/centos-kickstart-desktop.xml.in     | 13 +------------
 .../centos.org/centos-kickstart-jeos.xml.in        | 14 +-------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/data/install-script/centos.org/centos-kickstart-desktop.xml.in b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
index a1c3373..d7602d5 100644
--- a/data/install-script/centos.org/centos-kickstart-desktop.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-desktop.xml.in
@@ -111,18 +111,7 @@ clearpart --all --drives=<xsl:call-template name="target-disk"/>
 
 firstboot --disable
 
-<xsl:choose>
-  <xsl:when test="os/version < 7">
-part /boot --fstype ext4 --size=1024 --ondisk=<xsl:call-template name="target-disk"/>
-  </xsl:when>
-  <xsl:otherwise>
-part /boot --fstype ext4 --recommended --ondisk=<xsl:call-template name="target-disk"/>
-  </xsl:otherwise>
-</xsl:choose>
-part pv.2 --size=1 --grow --ondisk=<xsl:call-template name="target-disk"/>
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+autopart
 reboot
 
 <xsl:if test="script/installation-source = 'network'">
diff --git a/data/install-script/centos.org/centos-kickstart-jeos.xml.in b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
index 0f1efc2..14ccc1c 100644
--- a/data/install-script/centos.org/centos-kickstart-jeos.xml.in
+++ b/data/install-script/centos.org/centos-kickstart-jeos.xml.in
@@ -104,19 +104,7 @@ zerombr
 
 clearpart --all --drives=<xsl:call-template name="target-disk"/>
 
-
-<xsl:choose>
-  <xsl:when test="os/version < 7">
-part /boot --fstype ext4 --size=1024 --ondisk=<xsl:call-template name="target-disk"/>
-  </xsl:when>
-  <xsl:otherwise>
-part /boot --fstype ext4 --recommended --ondisk=<xsl:call-template name="target-disk"/>
-  </xsl:otherwise>
-</xsl:choose>
-part pv.2 --size=1 --grow --ondisk=<xsl:call-template name="target-disk"/>
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+autopart
 reboot
 
 <xsl:if test="script/installation-source = 'network'">
-- 
2.20.1