Fix previous nfs parsing patch. Rework virt-install cdrom validation to use non deprecated functions and accomodate all modes of installation.

Author: crobinso

virt-install

@@ -167,15 +167,15 @@ def get_fullvirt_cdrom(cdpath, location, guest):
     while 1:
         cdpath = cli.prompt_for_input(_("What is the virtual CD image, CD device or install location?"), cdpath)
         try:
-            # Build a throwaway disk to reuse its validation for local CDs only
-            if os.path.exists(os.path.abspath(cdpath)):
-                cddisk = virtinst.VirtualDisk(path=cdpath, 
+            # guest.cdrom is deprecated
+            guest.location = cdpath
+            if os.path.exists(guest.location):
+                # Build a throwaway disk for validation for local CDs only
+                cddisk = virtinst.VirtualDisk(path=guest.location, 
                                               transient=True,
                                               device=virtinst.VirtualDisk.DEVICE_CDROM,
                                               readOnly=True)
-                cdpath = os.path.abspath(cdpath)
-
-            guest.cdrom = cdpath
+            guest.installer.cdrom = True
             break
         except ValueError, e:
             print _("ERROR: "), e

virtinst/DistroManager.py

@@ -119,12 +119,19 @@ def __init__(self, type = "xen", location = None, boot = None, extraargs = None)
     def get_location(self):
         return self._location
     def set_location(self, val):
-        # Canonicalize nfs: URIs to be RFC compliant
-        if val.startswith("nfs:") and not val.startswith("nfs://"):
+        # 'location' is kind of overloaded: it can be a local file or device
+        # (for a boot.iso), local directory (for a tree), or an http, ftp, or 
+        # nfs for an iso or a tree
+        if os.path.exists(os.path.abspath(val)):
+            val = os.path.abspath(val)
+            logging.debug("DistroInstaller location is a local file/path: %s"\
+                          % val)
+        elif val.startswith("nfs:") and not val.startswith("nfs://"):
+            # Canonicalize nfs: URIs to be RFC compliant
             val = "nfs://" + val[4:]
-        if not (val.startswith("http://") or val.startswith("ftp://") or
-                val.startswith("nfs://") or val.startswith("/")):
-            raise ValueError(_("Install location must be an NFS, HTTP or FTP network install source, or local file/device"))
+        elif not (val.startswith("http://") or val.startswith("ftp://") or
+                  val.startswith("nfs://")):
+            raise ValueError(_("Install media location must be an NFS, HTTP or FTP network install source, or an existing local file/device"))
         if os.geteuid() != 0 and val.startswith("nfs://"):
             raise ValueError(_("NFS installations are only supported as root"))
         self._location = val

virtinst/ImageFetcher.py

@@ -152,9 +152,9 @@ def prepareLocation(self, progresscb):
         self.srcdir = tempfile.mkdtemp(prefix="virtinstmnt.", dir=self.scratchdir)
         logging.debug("Preparing mount at " + self.srcdir)
         if self.location.startswith("nfs://"):
-            cmd = ["mount", "-o", "ro", self.location[4:], self.srcdir]
-        elif self.location.startswith("nfs:"):
             cmd = ["mount", "-o", "ro", self.location[6:], self.srcdir]
+        elif self.location.startswith("nfs:"):
+            cmd = ["mount", "-o", "ro", self.location[4:], self.srcdir]
         else:
             if stat.S_ISBLK(os.stat(self.location)[stat.ST_MODE]):
                 cmd = ["mount", "-o", "ro", self.location, self.srcdir]