[Libosinfo] [osinfo-db PATCH 03/15] install-script, silverblue: Add script-disk template

Fabiano Fidêncio fidencio at redhat.com
Thu Jun 13 11:48:22 UTC 2019


Let's add the script disk template so we don't actually require the apps
to set it (but, if they do, the value set will be used).

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 .../silverblue-kickstart-desktop.xml.in               | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
index fd7971e..e981184 100644
--- a/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
+++ b/data/install-script/fedoraproject.org/silverblue-kickstart-desktop.xml.in
@@ -12,7 +12,7 @@
         <param name="user-login" policy="required"/>
         <param name="user-password" policy="optional"/>
         <param name="admin-password" policy="optional"/>
-        <param name="script-disk" policy="required"/>
+        <param name="script-disk" policy="optional"/>
     </config>
     <injection-method>cdrom</injection-method>
     <injection-method>disk</injection-method>
@@ -27,7 +27,14 @@
 
         <xsl:template name="script-disk">
           <xsl:variable name="script-disk">
-            <xsl:value-of select="config/script-disk"/>
+            <xsl:choose>
+              <xsl:when test="config/script-disk != ''">
+                <xsl:value-of select="config/script-disk"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:text>/dev/sda</xsl:text>
+              </xsl:otherwise>
+            </xsl:choose>
           </xsl:variable>
           <xsl:value-of select="substring-after($script-disk, '/dev/')"/>
         </xsl:template>
-- 
2.21.0




More information about the Libosinfo mailing list