diff options
| author | Jeremy Katz <katzj@redhat.com> | 2008-03-27 23:23:44 -0400 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2008-03-27 23:23:44 -0400 |
| commit | 6349b7bce50fe49ff1756bf191f71f1893cb8da8 (patch) | |
| tree | e9a008df3b6b45ee68afad6fa914bc4a895f687c | |
| parent | b3ee97ee6b28dd442732902d91cc3f659772cf0b (diff) | |
| download | anaconda-6349b7bce50fe49ff1756bf191f71f1893cb8da8.tar.gz anaconda-6349b7bce50fe49ff1756bf191f71f1893cb8da8.tar.xz anaconda-6349b7bce50fe49ff1756bf191f71f1893cb8da8.zip | |
Fix for test mode repo bits
Don't try to copy stage2 if we're not setting up filesystems (eg, test mode
or rootpath mode) and also have some fixes to allow for nfs: with a
local path
| -rw-r--r-- | yuminstall.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/yuminstall.py b/yuminstall.py index b9fb31125..2a0f2c58e 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -333,6 +333,9 @@ class AnacondaYum(YumSorter): self.localPackages = [] def systemMounted(self, fsset, chroot): + if not flags.setupFilesystem: + return + stage2img = None if os.path.exists("/tmp/stage2.img"): @@ -482,9 +485,12 @@ class AnacondaYum(YumSorter): self.conf.metadata_expire = 0 if self.anaconda.methodstr.startswith("nfs:"): + if os.path.isdir(self.anaconda.methodstr[4:]): + self.tree = self.anaconda.methodstr[4:] + else: + if not os.path.ismount(self.tree): + isys.mount(self.anaconda.methodstr[4:], self.tree, "nfs") methodstr = "file://%s" % self.tree - if not os.path.ismount(self.tree): - isys.mount(self.anaconda.methodstr[4:], self.tree, "nfs") elif self.anaconda.methodstr.startswith("nfsiso:"): methodstr = "file://%s" % self.tree elif self.anaconda.methodstr.startswith("cdrom:"): |