diff options
| -rw-r--r-- | image.py | 6 | ||||
| -rw-r--r-- | loader2/urls.c | 1 | ||||
| -rw-r--r-- | yuminstall.py | 10 |
3 files changed, 11 insertions, 6 deletions
@@ -129,8 +129,8 @@ def getMediaId(path): return None # This mounts the directory containing the iso images, and places the -# mount point in isodir. -def mountDirectory(isodir, methodstr, messageWindow): +# mount point in /mnt/isodir. +def mountDirectory(methodstr, messageWindow): if methodstr.startswith("hd:"): method = methodstr[3:] (device, fstype, path) = method.split(":", 3) @@ -153,7 +153,7 @@ def mountDirectory(isodir, methodstr, messageWindow): return try: - isys.mount(device, isodir, fstype = fstype) + isys.mount(device, "/mnt/isodir", fstype = fstype) except SystemError, msg: log.error("couldn't mount ISO source directory: %s" % msg) messageWindow(_("Couldn't Mount ISO Source"), diff --git a/loader2/urls.c b/loader2/urls.c index ce184e2fb..43006ac24 100644 --- a/loader2/urls.c +++ b/loader2/urls.c @@ -68,6 +68,7 @@ int convertURLToUI(char *url, struct iurlinfo *ui) { ui->password = strdup(url); url = chptr + 1; } else { + chptr = strchr(url, '@'); *chptr = '\0'; ui->login = strdup(url); url = chptr + 1; diff --git a/yuminstall.py b/yuminstall.py index af26e8007..9303607ca 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -295,7 +295,10 @@ class AnacondaYum(YumSorter): # directory where Packages/ is located. self.tree = "/mnt/source" - if self.anaconda.methodstr.startswith("hd:") or self.anaconda.methodstr.startswith("nfsiso:"): + if self.anaconda.methodstr.startswith("hd:"): + (device, fstype, path) = self.anaconda.methodstr[3:].split(":", 3) + self.isodir = "/mnt/isodir/%s" % path + elif self.anaconda.methodstr.startswith("nfsiso:"): self.isodir = "/mnt/isodir" else: self.isodir = None @@ -452,7 +455,7 @@ class AnacondaYum(YumSorter): # mountDirectory checks before doing anything, so it's safe to # call this repeatedly. - mountDirectory(self.isodir, self.anaconda.methodstr, + mountDirectory(self.anaconda.methodstr, self.anaconda.intf.messageWindow) self._discImages = mountImage(self.isodir, self.tree, discnum, @@ -1581,7 +1584,8 @@ class YumBackend(AnacondaBackend): try: iutil.execWithRedirect("yum", ["clean", "all"], stdout="/dev/tty5", stderr="/dev/tty5", - searchPath = 1) + searchPath = 1, + root = anaconda.rootPath) except: pass |