summaryrefslogtreecommitdiffstats
path: root/harddrive.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2001-06-22 16:27:26 +0000
committerJeremy Katz <katzj@redhat.com>2001-06-22 16:27:26 +0000
commit98027b0a5aedd84c21b8328830fd132cefd275d7 (patch)
tree21ed69356b85c8cc7bf835dfc704b73facd0a49c /harddrive.py
parent47770d7221df701d951372b3235706b45e345e67 (diff)
downloadanaconda-98027b0a5aedd84c21b8328830fd132cefd275d7.tar.gz
anaconda-98027b0a5aedd84c21b8328830fd132cefd275d7.tar.xz
anaconda-98027b0a5aedd84c21b8328830fd132cefd275d7.zip
don't reuse mountpoints and loop devs
Diffstat (limited to 'harddrive.py')
-rw-r--r--harddrive.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/harddrive.py b/harddrive.py
index 71e8d9cd3..c82181f6f 100644
--- a/harddrive.py
+++ b/harddrive.py
@@ -1,4 +1,4 @@
-# Install method for disk image installs (CD & NFS)
+# Install method for hard drive installs
from comps import ComponentSet, HeaderList, HeaderListFromFile
from installmethod import InstallMethod
@@ -71,7 +71,7 @@ class OldHardDriveInstallMethod(InstallMethod):
# since we read headers from the disk, we don't need to do this
pass
- def systemMounted(self, fstab, mntPoint, selected):
+ def systemMounted(self, fsset, chroot, selected):
self.mountMedia()
def filesDone(self):
@@ -102,18 +102,18 @@ class HardDriveInstallMethod(InstallMethod):
isoImage = self.isoDir + '/' + self.path + '/' + self.discImages[cdNum]
- isys.makeDevInode("loop2", "/tmp/loop2")
- isys.losetup("/tmp/loop2", isoImage, readOnly = 1)
+ isys.makeDevInode("loop3", "/tmp/loop3")
+ isys.losetup("/tmp/loop3", isoImage, readOnly = 1)
- isys.mount("loop2", "/tmp/hdimage", fstype = 'iso9660', readOnly = 1);
- self.tree = "/tmp/hdimage/"
+ isys.mount("loop3", "/tmp/isomedia", fstype = 'iso9660', readOnly = 1);
+ self.tree = "/tmp/isomedia/"
self.mediaIsMounted = cdNum
def umountMedia(self):
if self.mediaIsMounted:
isys.umount(self.tree)
- isys.makeDevInode("loop2", "/tmp/loop2")
- isys.unlosetup("/tmp/loop2")
+ isys.makeDevInode("loop3", "/tmp/loop3")
+ isys.unlosetup("/tmp/loop3")
self.umountDirectory()
self.tree = None
self.mediaIsMounted = 0
@@ -180,7 +180,7 @@ class HardDriveInstallMethod(InstallMethod):
hdlist.mergeFullHeaders(self.tree + "/RedHat/base/hdlist2")
self.umountMedia()
- def systemMounted(self, fstab, mntPoint, selected):
+ def systemMounted(self, fsset, mntPoint, selected):
self.mountMedia(1)
def filesDone(self):