diff options
| author | Chris Lumens <clumens@redhat.com> | 2006-05-25 20:58:05 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2006-05-25 20:58:05 +0000 |
| commit | ec5d1b92962181498d3e4b52127f41d3bb1b0073 (patch) | |
| tree | 93ae7eba6633f71e87804667328b6554a60b7782 /harddrive.py | |
| parent | 770242c3d300f1b478df446f899b1c13e830ead7 (diff) | |
| download | anaconda-ec5d1b92962181498d3e4b52127f41d3bb1b0073.tar.gz anaconda-ec5d1b92962181498d3e4b52127f41d3bb1b0073.tar.xz anaconda-ec5d1b92962181498d3e4b52127f41d3bb1b0073.zip | |
Fix hard drive ISO installs/upgrades (#185292, #187941).
Diffstat (limited to 'harddrive.py')
| -rw-r--r-- | harddrive.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/harddrive.py b/harddrive.py index fce31f3ff..b2b3909eb 100644 --- a/harddrive.py +++ b/harddrive.py @@ -60,8 +60,7 @@ class HardDriveInstallMethod(ImageInstallMethod): isys.makeDevInode("loop3", "/tmp/loop3") isys.losetup("/tmp/loop3", isoImage, readOnly = 1) - isys.mount("loop3", "/tmp/isomedia", fstype = 'iso9660', readOnly = 1); - self.tree = "/tmp/isomedia/" + isys.mount("loop3", self.tree, fstype = 'iso9660', readOnly = 1); self.mediaIsMounted = cdNum retry = False @@ -88,7 +87,6 @@ class HardDriveInstallMethod(ImageInstallMethod): isys.makeDevInode("loop3", "/tmp/loop3") isys.unlosetup("/tmp/loop3") self.umountDirectory() - self.tree = None self.mediaIsMounted = 0 # This mounts the directory containing the iso images, and places the @@ -116,7 +114,6 @@ class HardDriveInstallMethod(ImageInstallMethod): def umountDirectory(self): if self.isoDirIsMounted: isys.umount(self.isoDir) - self.tree = None self.isoDirIsMounted = 0 # return reference to file specified on ISO #1 @@ -168,8 +165,7 @@ class HardDriveInstallMethod(ImageInstallMethod): path = tmpmethod[tmpmethod.index("/") + 1:] ImageInstallMethod.__init__(self, method, rootPath, intf) - self.tree = None - + self.device = device self.path = path self.fstype = fstype @@ -177,11 +173,10 @@ class HardDriveInstallMethod(ImageInstallMethod): self.mediaIsMounted = 0 self.messageWindow = intf.messageWindow self.currentMedia = [] + self.tree = "/tmp/isomedia/" - # Go ahead and poke through the directory looking for interesting - # iso images + # Mount the partition containing the ISO images just long enough for + # us to build up a list of all the path names. self.mountDirectory() self.discImages = findIsoImages(self.isoDir + '/' + self.path, self.messageWindow) - self.umountDirectory() - - + self.umountDirectory() |