Attachment 289501 Details for Bug 345721 – Fix xen guest installs against Satellite

[patch] Fix xen guest installs against Satellite

virtinst-0.103.0-satellite-distro.patch (text/plain), 3.71 KB, created by Daniel Berrangé on 2007-12-14 21:25:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2007-12-14 21:25:25 UTC

Size: 3.71 KB

patch

obsolete

>diff -rup virtinst-0.103.0.orig/virtinst/DistroManager.py virtinst-0.103.0/virtinst/DistroManager.py
>--- virtinst-0.103.0.orig/virtinst/DistroManager.py	2007-12-07 14:04:58.000000000 -0500
>+++ virtinst-0.103.0/virtinst/DistroManager.py	2007-12-07 14:05:28.000000000 -0500
>@@ -536,6 +536,27 @@ def _fetcherForURI(uri, scratchdir=None)
>     else:
>         return MountedImageFetcher(uri, scratchdir)
> 
>+# Used as a workaround for Satellite issue 
>+def _checkRHDistro(fetcher, baseuri, type, progresscb, distro=None, scratchdir=None):
>+    # Check for fedora distro
>+    store = FedoraImageStore(baseuri, type, scratchdir)
>+    if store.isValidStore(fetcher, progresscb):
>+        return store
>+    # Check for CentOS?
>+    if fetcher.hasFile("centosdocs-man.css", progresscb):
>+        logging.debug("Detected a CentOS distro")
>+        return CentOSImageStore(baseuri, type, scratchdir)
>+    # Check for RHEL-5
>+    if fetcher.hasFile("RPM-GPG-KEY-redhat-release", progresscb):
>+        logging.debug("Detected a RHEL-5 distro")
>+        return RHELImageStore(baseuri, type, scratchdir)
>+    # Check for RHEL-4
>+    if fetcher.hasFile("autorun", progresscb) and \
>+       fetcher.hasFile("RPM-GPG-KEY", progresscb):
>+        logging.debug("Detected a RHEL-4 distro")
>+        return RHELImageStore(baseuri, type, scratchdir)
>+    return False
>+
> def _storeForDistro(fetcher, baseuri, type, progresscb, distro=None, scratchdir=None):
>     stores = []
>     if distro == "fedora" or distro is None:
>@@ -565,11 +586,18 @@ def _storeForDistro(fetcher, baseuri, ty
> # Method to fetch a krenel & initrd pair for a particular distro / HV type
> def acquireKernel(baseuri, progresscb, scratchdir="/var/tmp", type=None, distro=None):
>     fetcher = _fetcherForURI(baseuri, scratchdir)
>+    store = None    
>     if not fetcher.prepareLocation(progresscb):
>-        raise RuntimeError, "Invalid install location"
>+        logging.debug("Tree URL could not be opened. Checking ahead for valid RH distro.")
>+        store = _checkRHDistro(fetcher=fetcher, baseuri=baseuri, type=type,
>+                                progresscb=progresscb, distro=distro, 
>+                                scratchdir=scratchdir)
>+        if not store:
>+            raise RuntimeError, "Invalid install location"
> 
>     try:
>-        store = _storeForDistro(fetcher=fetcher, baseuri=baseuri, type=type, \
>+        if store is None:
>+            store = _storeForDistro(fetcher=fetcher, baseuri=baseuri, type=type, \
>                                 progresscb=progresscb, distro=distro, scratchdir=scratchdir)
>         return store.acquireKernel(fetcher, progresscb)
>     finally:
>@@ -578,11 +606,18 @@ def acquireKernel(baseuri, progresscb, s
> # Method to fetch a bootable ISO image for a particular distro / HV type
> def acquireBootDisk(baseuri, progresscb, scratchdir="/var/tmp", type=None, distro=None):
>     fetcher = _fetcherForURI(baseuri, scratchdir)
>+    store = None    
>     if not fetcher.prepareLocation(progresscb):
>-        raise RuntimeError, "Invalid install location"
>+        logging.debug("Tree URL could not be opened. Checking ahead for valid RH distro.")
>+        store = _checkRHDistro(fetcher=fetcher, baseuri=baseuri, type=type,
>+                                progresscb=progresscb, distro=distro, 
>+                                scratchdir=scratchdir)
>+        if not store:
>+            raise RuntimeError, "Invalid install location"
> 
>     try:
>-        store = _storeForDistro(fetcher=fetcher, baseuri=baseuri, type=type, \
>+        if store is None:
>+            store = _storeForDistro(fetcher=fetcher, baseuri=baseuri, type=type, \
>                                 progresscb=progresscb, distro=distro, scratchdir=scratchdir)
>         return store.acquireBootDisk(fetcher, progresscb)
>     finally:

Actions: View | Diff

Attachments on bug 345721: 234611 | 234621 | 234631 | 234641 | 245821 | 289501 | 291668