summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-12-16 16:14:50 -0500
committerChris Lumens <clumens@redhat.com>2009-12-16 16:40:40 -0500
commita75aa437f6fcbf988904b8a630cc82ef12c98dd6 (patch)
tree4db3f62f52b9024c92d16a0eda4e755ed52076ed
parent5fdf5110a39e734753e246480b94d54af65faf31 (diff)
downloadanaconda-a75aa437f6fcbf988904b8a630cc82ef12c98dd6.tar.gz
anaconda-a75aa437f6fcbf988904b8a630cc82ef12c98dd6.tar.xz
anaconda-a75aa437f6fcbf988904b8a630cc82ef12c98dd6.zip
Clean up setting paths on preupgrade (jvonau).
-rw-r--r--yuminstall.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/yuminstall.py b/yuminstall.py
index 480fe0283..ab34dfbee 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -425,7 +425,11 @@ class AnacondaYum(YumSorter):
# whatever) is mounted yet since loader only mounts the source
# for the stage2 image. We need to set up the source mount
# now.
- if self.anaconda.methodstr:
+ if flags.cmdline.has_key("preupgrade"):
+ path = "/var/cache/yum/preupgrade"
+ self.anaconda.methodstr = "hd::%s" % path
+ self._baseRepoURL = "file:///mnt/sysimage/%s" % path
+ elif self.anaconda.methodstr:
m = self.anaconda.methodstr
if m.startswith("hd:"):
@@ -433,10 +437,6 @@ class AnacondaYum(YumSorter):
(device, path) = m[3:].split(":")
else:
(device, fstype, path) = m[3:].split(":")
-
- if flags.cmdline.has_key("preupgrade"):
- self._baseRepoURL = "file:///mnt/sysimage/%s" % path
- else:
self.isodir = "/mnt/isodir/%s" % path
# This takes care of mounting /mnt/isodir first.