[virt-tools-list] [libosinfo] fedora, win, installer: Assume full paths

Zeeshan Ali (Khattak) zeeshanak at gnome.org
Fri Dec 7 20:31:55 UTC 2012


From: "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org>

According to the documentation, we expect apps to specify full paths for
disks and locations so we must assume they are so in the scripts.
---
 data/install-scripts/fedora.xml      | 12 ++++++------
 data/install-scripts/windows-cmd.xml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/install-scripts/fedora.xml b/data/install-scripts/fedora.xml
index b3c2b47..99218cd 100644
--- a/data/install-scripts/fedora.xml
+++ b/data/install-scripts/fedora.xml
@@ -24,15 +24,15 @@
             </xsl:when>
             <xsl:when test="os/version > 9">
               <!-- virtio -->
-              <xsl:text>vda</xsl:text>
+              <xsl:text>/dev/vda</xsl:text>
             </xsl:when>
             <xsl:when test="os/version > 6">
               <!-- libata IDE -->
-              <xsl:text>sda</xsl:text>
+              <xsl:text>/dev/sda</xsl:text>
             </xsl:when>
             <xsl:otherwise>
               <!-- IDE -->
-              <xsl:text>hda</xsl:text>
+              <xsl:text>/dev/hda</xsl:text>
             </xsl:otherwise>
           </xsl:choose>
         </xsl:template>
@@ -225,15 +225,15 @@ reboot
             </xsl:when>
             <xsl:when test="os/version > 9">
               <!-- virtio -->
-              <xsl:text>vda</xsl:text>
+              <xsl:text>/dev/vda</xsl:text>
             </xsl:when>
             <xsl:when test="os/version > 6">
               <!-- libata IDE -->
-              <xsl:text>sda</xsl:text>
+              <xsl:text>/dev/sda</xsl:text>
             </xsl:when>
             <xsl:otherwise>
               <!-- IDE -->
-              <xsl:text>hda</xsl:text>
+              <xsl:text>/dev/hda</xsl:text>
             </xsl:otherwise>
           </xsl:choose>
         </xsl:template>
diff --git a/data/install-scripts/windows-cmd.xml b/data/install-scripts/windows-cmd.xml
index 84833a9..85aae12 100644
--- a/data/install-scripts/windows-cmd.xml
+++ b/data/install-scripts/windows-cmd.xml
@@ -51,7 +51,7 @@ sc config TlntSvr start= auto
 net user <xsl:value-of select="config/user-realname"/> <xsl:text> </xsl:text> <xsl:value-of select="config/admin-password"/> /add /passwordreq:no
 net localgroup administrators <xsl:value-of select="config/user-realname"/> /add
 net accounts /maxpwage:unlimited
-if not "<xsl:value-of select="config/avatar-location"/>"=="" copy "<xsl:value-of select="config/avatar-disk"/>:\<xsl:value-of select="config/avatar-location"/>" "<xsl:call-template name="target-disk"/>:\Documents and Settings\All Users\Application Data\Microsoft\User Account Pictures\<xsl:value-of select="config/user-realname"/>.bmp"
+if not "<xsl:value-of select="config/avatar-location"/>"=="" copy "<xsl:value-of select="config/avatar-disk"/>:<xsl:value-of select="config/avatar-location"/>" "<xsl:call-template name="target-disk"/>:\Documents and Settings\All Users\Application Data\Microsoft\User Account Pictures\<xsl:value-of select="config/user-realname"/>.bmp"
 REGEDIT /S <xsl:call-template name="script-disk"/>:\windows.reg
 EXIT
 	</xsl:template>
-- 
1.8.0.1




More information about the virt-tools-list mailing list