[Libosinfo] [osinfo-db PATCH 5/5] install-script, windows: cdrom is also a viable injection method

Fabiano Fidêncio fidencio at redhat.com
Thu Jun 6 12:31:12 UTC 2019


For scripts being used on Windows Vista+ the unattended installer can
also be used via cdrom and not only via a floppy device.

Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
---
 .../microsoft.com/windows-cmd-desktop.xml.in               | 7 +++++++
 .../microsoft.com/windows-unattend-desktop.xml.in          | 7 +++++++
 .../microsoft.com/windows-unattend-jeos.xml.in             | 4 ++++
 3 files changed, 18 insertions(+)

diff --git a/data/install-script/microsoft.com/windows-cmd-desktop.xml.in b/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
index f70a1c1..f58b9ce 100644
--- a/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-cmd-desktop.xml.in
@@ -18,6 +18,7 @@
       <param name="post-install-drivers-location" policy="optional"/>
       <param name="driver-signing" policy="optional"/>
     </config>
+    <injection-method>cdrom</injection-method>
     <injection-method>floppy</injection-method>
     <avatar-format>
       <mime-type>image/bmp</mime-type>
@@ -47,6 +48,9 @@
             <xsl:when test="config/script-disk != ''">
               <xsl:value-of select="config/script-disk"/>
             </xsl:when>
+            <xsl:when test="script/preferred-injection-method = 'cdrom'">
+              <xsl:text>E</xsl:text>
+            </xsl:when>
             <xsl:otherwise>
               <xsl:text>A</xsl:text>
             </xsl:otherwise>
@@ -58,6 +62,9 @@
             <xsl:when test="config/post-install-drivers-disk != ''">
               <xsl:value-of select="config/post-install-drivers-disk"/>
             </xsl:when>
+            <xsl:when test="script/preferred-injection-method = 'cdrom'">
+              <xsl:text>E</xsl:text>
+            </xsl:when>
             <xsl:otherwise>
               <xsl:text>A</xsl:text>
             </xsl:otherwise>
diff --git a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
index cfdbf28..dfc10a8 100644
--- a/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
+++ b/data/install-script/microsoft.com/windows-unattend-desktop.xml.in
@@ -21,6 +21,7 @@
     <param name="pre-install-drivers-location" policy="optional"/>
     <param name="script-disk" policy="optional"/>
    </config>
+    <injection-method>cdrom</injection-method>
     <injection-method>floppy</injection-method>
     <template>
      <xsl:stylesheet
@@ -45,6 +46,9 @@
           <xsl:when test="config/script-disk != ''">
             <xsl:value-of select="config/script-disk"/>
           </xsl:when>
+          <xsl:when test="script/preferred-injection-method = 'cdrom'">
+            <xsl:text>E</xsl:text>
+          </xsl:when>
           <xsl:otherwise>
             <xsl:text>A</xsl:text>
           </xsl:otherwise>
@@ -70,6 +74,9 @@
          <xsl:when test="config/pre-install-drivers-disk != ''">
            <xsl:value-of select="config/pre-install-drivers-disk"/>
          </xsl:when>
+         <xsl:when test="script/preferred-injection-method = 'cdrom'">
+           <xsl:text>E</xsl:text>
+         </xsl:when>
          <xsl:otherwise>
            <xsl:text>A</xsl:text>
          </xsl:otherwise>
diff --git a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
index 78b75db..c7fa572 100644
--- a/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
+++ b/data/install-script/microsoft.com/windows-unattend-jeos.xml.in
@@ -19,6 +19,7 @@
       <param name="pre-install-drivers-disk" policy="optional"/>
       <param name="pre-install-drivers-location" policy="optional"/>
     </config>
+    <injection-method>cdrom</injection-method>
     <injection-method>floppy</injection-method>
     <template>
       <xsl:stylesheet
@@ -57,6 +58,9 @@
             <xsl:when test="config/pre-install-drivers-disk != ''">
               <xsl:value-of select="config/pre-install-drivers-disk"/>
             </xsl:when>
+            <xsl:when test="script/preferred-injection-method = 'cdrom'">
+              <xsl:text>E</xsl:text>
+            </xsl:when>
             <xsl:otherwise>
               <xsl:text>A</xsl:text>
             </xsl:otherwise>
-- 
2.21.0




More information about the Libosinfo mailing list