[Libosinfo] [PATCH v2 45/52] data: split fedora into one file per install script

Daniel P. Berrange berrange at redhat.com
Mon Oct 5 15:31:49 UTC 2015


Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 configure.ac                                       |   1 +
 data/install-scripts/Makefile.am                   |   2 +-
 data/install-scripts/fedoraproject.org/Makefile.am |   1 +
 .../fedora-kickstart-desktop.xml.in}               | 158 ---------------------
 .../fedoraproject.org/fedora-kickstart-jeos.xml.in | 156 ++++++++++++++++++++
 5 files changed, 159 insertions(+), 159 deletions(-)
 create mode 100644 data/install-scripts/fedoraproject.org/Makefile.am
 rename data/install-scripts/{fedora.xml => fedoraproject.org/fedora-kickstart-desktop.xml.in} (56%)
 create mode 100644 data/install-scripts/fedoraproject.org/fedora-kickstart-jeos.xml.in

diff --git a/configure.ac b/configure.ac
index 72eff54..7aaa6ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,6 +178,7 @@ AC_CONFIG_FILES([
 	data/platforms/xen.org/Makefile
 	data/install-scripts/Makefile
 	data/install-scripts/debian.org/Makefile
+	data/install-scripts/fedoraproject.org/Makefile
 	data/oses/Makefile
 	data/oses/altlinux.org/Makefile
 	data/oses/apple.com/Makefile
diff --git a/data/install-scripts/Makefile.am b/data/install-scripts/Makefile.am
index 875cf77..69f4fbc 100644
--- a/data/install-scripts/Makefile.am
+++ b/data/install-scripts/Makefile.am
@@ -1,11 +1,11 @@
 
 SUBDIRS = \
 	debian.org \
+	fedoraproject.org \
 	$(NULL)
 
 databasedir = $(pkgdatadir)/db/install-scripts/
 database_DATA =     \
-  fedora.xml        \
   rhel.xml          \
   ubuntu.xml        \
   windows-sif.xml   \
diff --git a/data/install-scripts/fedoraproject.org/Makefile.am b/data/install-scripts/fedoraproject.org/Makefile.am
new file mode 100644
index 0000000..ee4552b
--- /dev/null
+++ b/data/install-scripts/fedoraproject.org/Makefile.am
@@ -0,0 +1 @@
+include ../../Makefile.inc
diff --git a/data/install-scripts/fedora.xml b/data/install-scripts/fedoraproject.org/fedora-kickstart-desktop.xml.in
similarity index 56%
rename from data/install-scripts/fedora.xml
rename to data/install-scripts/fedoraproject.org/fedora-kickstart-desktop.xml.in
index 263d14a..be7a965 100644
--- a/data/install-scripts/fedora.xml
+++ b/data/install-scripts/fedoraproject.org/fedora-kickstart-desktop.xml.in
@@ -1,161 +1,4 @@
 <libosinfo version="0.0.1">
-  <!-- JEOS PROFILE -->
-  <install-script id='http://fedoraproject.org/fedora/kickstart/jeos'>
-    <profile>jeos</profile>
-    <expected-filename>fedora.ks</expected-filename>
-    <config>
-      <param name="admin-password" policy="optional"/>
-      <param name="l10n-keyboard" policy="optional" value-map="http://x.org/x11-keyboard"/>
-      <param name="l10n-language" policy="optional"/>
-      <param name="l10n-timezone" policy="optional"/>
-      <param name="target-disk" policy="optional"/>
-      <param name="script-disk" policy="required"/>
-    </config>
-    <injection-method>cdrom</injection-method>
-    <injection-method>disk</injection-method>
-    <injection-method>floppy</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 > 9">
-              <!-- virtio -->
-              <xsl:text>/dev/vda</xsl:text>
-            </xsl:when>
-            <xsl:when test="os/version > 6">
-              <!-- libata IDE -->
-              <xsl:text>/dev/sda</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <!-- IDE -->
-              <xsl:text>/dev/hda</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:template>
-
-        <xsl:template name="script-disk">
-          <xsl:variable name="script-disk">
-            <xsl:value-of select="config/script-disk"/>
-          </xsl:variable>
-          <xsl:value-of select="substring-after($script-disk, '/dev/')"/>
-        </xsl:template>
-
-	<xsl:template name="rootfs">
-	  <xsl:choose>
-	    <xsl:when test="os/version > 10">
-	      <xsl:text>ext4</xsl:text>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:text>ext3</xsl:text>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:template>
-
-	<xsl:template name="bootfs">
-	  <xsl:choose>
-	    <xsl:when test="os/version > 11">
-	      <xsl:text>ext4</xsl:text>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:text>ext3</xsl:text>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:template>
-
-	<xsl:template name="keyboard">
-	  <xsl:choose>
-	    <xsl:when test="os/version > 17">
-              <xsl:value-of select="config/l10n-keyboard"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-              <!-- FIXME: F17 and older required keyboard layout to be a console
-                   layout so we'll need a different datamap for those but
-                   currently we only support one datamap per config param per
-                   script. -->
-	      <xsl:text>us</xsl:text>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:template>
-
-        <xsl:template match="/command-line">
-            <xsl:text>ks=hd:</xsl:text>
-            <xsl:call-template name="script-disk"/>
-            <xsl:text>:/</xsl:text>
-            <xsl:value-of select="script/expected-filename"/>
-        </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="count(media/variant) = 0 or not(contains(media/variant, 'netinst'))">
-install
-cdrom
-</xsl:if>
-text
-keyboard '<xsl:call-template name="keyboard"/>'
-lang <xsl:value-of select="config/l10n-language"/>
-<xsl:if test="os/version < 7">
-langsupport --default <xsl:value-of select="config/l10n-language"/> <xsl:value-of select="config/l10n-language"/>
-mouse generic3ps/2 --device psaux
-</xsl:if>
-skipx
-network --bootproto dhcp
-rootpw <xsl:value-of select="config/admin-password"/>
-firewall --disabled
-authconfig --enableshadow --enablemd5
-<xsl:if test="os/version > 1">
-selinux --enforcing
-</xsl:if>
-timezone --utc <xsl:value-of select="config/l10n-timezone"/>
-bootloader --location=mbr
-zerombr <xsl:if test="os/version < 14">yes</xsl:if>
-
-clearpart --all --drives=<xsl:call-template name="target-disk"/>
-
-<xsl:if test="os/version > 15">
-part biosboot --fstype=biosboot --size=1
-</xsl:if>
-part /boot --fstype <xsl:call-template name="bootfs"/> --recommended --ondisk=<xsl:call-template name="target-disk"/>
-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 <xsl:call-template name="rootfs"/> --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
-reboot
-
-<xsl:if test="contains(media/variant, 'netinst')">
-repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&arch=$basearch
-</xsl:if>
-
-%packages
-<xsl:choose>
-  <xsl:when test="os/version < 18">
- at base
-  </xsl:when>
-  <xsl:otherwise>
- at standard
-  </xsl:otherwise>
-</xsl:choose>
- at core
-<xsl:if test="os/version > 6">
- at hardware-support
-</xsl:if>
-
-%end
-	</xsl:template>
-      </xsl:stylesheet>
-    </template>
-  </install-script>
-
-  <!-- DESKTOP PROFILE -->
   <install-script id='http://fedoraproject.org/fedora/kickstart/desktop'>
     <profile>desktop</profile>
     <expected-filename>fedora.ks</expected-filename>
@@ -366,5 +209,4 @@ AutomaticLogin=<xsl:value-of select="config/user-login"/>
       </xsl:stylesheet>
     </template>
   </install-script>
-
 </libosinfo>
diff --git a/data/install-scripts/fedoraproject.org/fedora-kickstart-jeos.xml.in b/data/install-scripts/fedoraproject.org/fedora-kickstart-jeos.xml.in
new file mode 100644
index 0000000..55cd52f
--- /dev/null
+++ b/data/install-scripts/fedoraproject.org/fedora-kickstart-jeos.xml.in
@@ -0,0 +1,156 @@
+<libosinfo version="0.0.1">
+  <install-script id='http://fedoraproject.org/fedora/kickstart/jeos'>
+    <profile>jeos</profile>
+    <expected-filename>fedora.ks</expected-filename>
+    <config>
+      <param name="admin-password" policy="optional"/>
+      <param name="l10n-keyboard" policy="optional" value-map="http://x.org/x11-keyboard"/>
+      <param name="l10n-language" policy="optional"/>
+      <param name="l10n-timezone" policy="optional"/>
+      <param name="target-disk" policy="optional"/>
+      <param name="script-disk" policy="required"/>
+    </config>
+    <injection-method>cdrom</injection-method>
+    <injection-method>disk</injection-method>
+    <injection-method>floppy</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 > 9">
+              <!-- virtio -->
+              <xsl:text>/dev/vda</xsl:text>
+            </xsl:when>
+            <xsl:when test="os/version > 6">
+              <!-- libata IDE -->
+              <xsl:text>/dev/sda</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+              <!-- IDE -->
+              <xsl:text>/dev/hda</xsl:text>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:template>
+
+        <xsl:template name="script-disk">
+          <xsl:variable name="script-disk">
+            <xsl:value-of select="config/script-disk"/>
+          </xsl:variable>
+          <xsl:value-of select="substring-after($script-disk, '/dev/')"/>
+        </xsl:template>
+
+	<xsl:template name="rootfs">
+	  <xsl:choose>
+	    <xsl:when test="os/version > 10">
+	      <xsl:text>ext4</xsl:text>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <xsl:text>ext3</xsl:text>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="bootfs">
+	  <xsl:choose>
+	    <xsl:when test="os/version > 11">
+	      <xsl:text>ext4</xsl:text>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <xsl:text>ext3</xsl:text>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="keyboard">
+	  <xsl:choose>
+	    <xsl:when test="os/version > 17">
+              <xsl:value-of select="config/l10n-keyboard"/>
+	    </xsl:when>
+	    <xsl:otherwise>
+              <!-- FIXME: F17 and older required keyboard layout to be a console
+                   layout so we'll need a different datamap for those but
+                   currently we only support one datamap per config param per
+                   script. -->
+	      <xsl:text>us</xsl:text>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	</xsl:template>
+
+        <xsl:template match="/command-line">
+            <xsl:text>ks=hd:</xsl:text>
+            <xsl:call-template name="script-disk"/>
+            <xsl:text>:/</xsl:text>
+            <xsl:value-of select="script/expected-filename"/>
+        </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="count(media/variant) = 0 or not(contains(media/variant, 'netinst'))">
+install
+cdrom
+</xsl:if>
+text
+keyboard '<xsl:call-template name="keyboard"/>'
+lang <xsl:value-of select="config/l10n-language"/>
+<xsl:if test="os/version < 7">
+langsupport --default <xsl:value-of select="config/l10n-language"/> <xsl:value-of select="config/l10n-language"/>
+mouse generic3ps/2 --device psaux
+</xsl:if>
+skipx
+network --bootproto dhcp
+rootpw <xsl:value-of select="config/admin-password"/>
+firewall --disabled
+authconfig --enableshadow --enablemd5
+<xsl:if test="os/version > 1">
+selinux --enforcing
+</xsl:if>
+timezone --utc <xsl:value-of select="config/l10n-timezone"/>
+bootloader --location=mbr
+zerombr <xsl:if test="os/version < 14">yes</xsl:if>
+
+clearpart --all --drives=<xsl:call-template name="target-disk"/>
+
+<xsl:if test="os/version > 15">
+part biosboot --fstype=biosboot --size=1
+</xsl:if>
+part /boot --fstype <xsl:call-template name="bootfs"/> --recommended --ondisk=<xsl:call-template name="target-disk"/>
+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 <xsl:call-template name="rootfs"/> --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
+reboot
+
+<xsl:if test="contains(media/variant, 'netinst')">
+repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+url --mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-install-$releasever&arch=$basearch
+</xsl:if>
+
+%packages
+<xsl:choose>
+  <xsl:when test="os/version < 18">
+ at base
+  </xsl:when>
+  <xsl:otherwise>
+ at standard
+  </xsl:otherwise>
+</xsl:choose>
+ at core
+<xsl:if test="os/version > 6">
+ at hardware-support
+</xsl:if>
+
+%end
+	</xsl:template>
+      </xsl:stylesheet>
+    </template>
+  </install-script>
+</libosinfo>
-- 
2.4.3




More information about the Libosinfo mailing list