diff options
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | fsset.py | 4 | ||||
| -rw-r--r-- | harddrive.py | 8 | ||||
| -rw-r--r-- | image.py | 23 | ||||
| -rw-r--r-- | iutil.py | 5 | ||||
| -rw-r--r-- | rescue.py | 5 | ||||
| -rw-r--r-- | urlinstall.py | 6 |
7 files changed, 42 insertions, 32 deletions
@@ -1,3 +1,26 @@ +2007-07-25 Jeremy Katz <katzj@redhat.com> + + * fsset.py (allocateLoopback): Use /dev/loopX instead of /tmp/loopX + + * urlinstall.py (UrlInstallMethod.systemMounted): Use /dev/loop0 + instead of /tmp/loop. + (UrlInstallMethod.systemUnmounted): Likewise. + + * rescue.py (runRescue): Loop devices made generally now. + + * harddrive.py (HardDriveInstallMethod.mountMedia): Use /dev/loop3 + instead of /tmp/loop + (HardDriveInstallMethod.umountMedia): Likewise. + + * image.py (CdromInstallMethod.systemUnmounted): Use /dev/loop0 + instead of /tmp/loop + (CdromInstallMethod.systemMounted): Likewise. + (NfsIsoInstallMethod.mountImage): Likewise for /dev/loop3 + (NfsIsoInstallMethod.umountImage): Likewise. + (findIsoImages): Likewise for /dev/loop2. + + * iutil.py (makeDriveDeviceNodes): Make loop devices. + 2007-07-25 Peter Jones <pjones@redhat.com> * gptsync/gptsync.c (write_mbr): print something when we're @@ -2717,9 +2717,7 @@ def getFStoTry(device): def allocateLoopback(file): found = 1 for i in range(8): - dev = "loop%d" % (i,) - path = "/tmp/loop%d" % (i,) - isys.makeDevInode(dev, path) + path = "/dev/loop%d" % (i,) try: isys.losetup(path, file) found = 1 diff --git a/harddrive.py b/harddrive.py index 5ef69505c..c40808b8e 100644 --- a/harddrive.py +++ b/harddrive.py @@ -60,10 +60,9 @@ class HardDriveInstallMethod(ImageInstallMethod): try: isoImage = self.isoDir + '/' + self.path + '/' + self.discImages[cdNum] - isys.makeDevInode("loop3", "/tmp/loop3") - isys.losetup("/tmp/loop3", isoImage, readOnly = 1) + isys.losetup("/dev/loop3", isoImage, readOnly = 1) - isys.mount("loop3", self.tree, fstype = 'iso9660', readOnly = 1); + isys.mount("/dev/loop3", self.tree, fstype = 'iso9660', readOnly = 1); self.mediaIsMounted = cdNum retry = False @@ -87,8 +86,7 @@ class HardDriveInstallMethod(ImageInstallMethod): def umountMedia(self): if self.mediaIsMounted: isys.umount(self.tree) - isys.makeDevInode("loop3", "/tmp/loop3") - isys.unlosetup("/tmp/loop3") + isys.unlosetup("/dev/loop3") self.umountDirectory() self.mediaIsMounted = 0 @@ -152,8 +152,7 @@ class CdromInstallMethod(ImageInstallMethod): def systemUnmounted(self): if self.loopbackFile: - isys.makeDevInode("loop0", "/tmp/loop") - isys.lochangefd("/tmp/loop", + isys.lochangefd("/dev/loop0", "%s/images/stage2.img" % (self.tree,)) self.loopbackFile = None @@ -184,8 +183,7 @@ class CdromInstallMethod(ImageInstallMethod): os.unlink(self.loopbackFile) return 1 - isys.makeDevInode("loop0", "/tmp/loop") - isys.lochangefd("/tmp/loop", self.loopbackFile) + isys.lochangefd("/dev/loop0", self.loopbackFile) def getFilename(self, filename, callback=None, destdir=None, retry=1): return self.tree + "/" + filename @@ -398,15 +396,13 @@ def findIsoImages(path, messageWindow): if not isys.isIsoImage(what): continue - isys.makeDevInode("loop2", "/tmp/loop2") - try: - isys.losetup("/tmp/loop2", what, readOnly = 1) + isys.losetup("/dev/loop2", what, readOnly = 1) except SystemError: continue try: - isys.mount("loop2", "/mnt/cdimage", fstype = "iso9660", + isys.mount("/dev/loop2", "/mnt/cdimage", fstype = "iso9660", readOnly = 1) for num in range(1, 10): if os.access("/mnt/cdimage/.discinfo", os.R_OK): @@ -460,8 +456,7 @@ def findIsoImages(path, messageWindow): except SystemError: pass - isys.makeDevInode("loop2", '/tmp/' + "loop2") - isys.unlosetup("/tmp/loop2") + isys.unlosetup("/dev/loop2") return discImages @@ -490,8 +485,7 @@ class NfsIsoInstallMethod(NfsInstallMethod): def umountImage(self): if self.currentMedia: isys.umount(self.mntPoint) - isys.makeDevInode("loop3", "/tmp/loop3") - isys.unlosetup("/tmp/loop3") + isys.unlosetup("/dev/loop3") self.mntPoint = None self.currentMedia = [] @@ -504,10 +498,9 @@ class NfsIsoInstallMethod(NfsInstallMethod): try: isoImage = self.isoPath + '/' + self.discImages[cdNum] - isys.makeDevInode("loop3", "/tmp/loop3") - isys.losetup("/tmp/loop3", isoImage, readOnly = 1) + isys.losetup("/dev/loop3", isoImage, readOnly = 1) - isys.mount("loop3", "/tmp/isomedia", fstype = 'iso9660', readOnly = 1); + isys.mount("/dev/loop3", "/tmp/isomedia", fstype = 'iso9660', readOnly = 1); self.mntPoint = "/tmp/isomedia/" self.currentMedia = [ cdNum ] @@ -270,6 +270,11 @@ def makeDriveDeviceNodes(): # make the node for the device mapper makeDMNode() + + # make loop devices + for loopMinor in range(0, 8): + loop = "loop%d" %(loopMinor,) + isys.makeDevInode(loop, "/dev/%s" %(loop,)) # this is disgusting and I feel very dirty def hasiSeriesNativeStorage(): @@ -275,11 +275,6 @@ def runRescue(anaconda, instClass): runShell() sys.exit(0) - # need loopback devices too - for lpminor in range(8): - dev = "loop%s" % (lpminor,) - isys.makeDevInode(dev, "/dev/" + dev) - screen = SnackScreen() anaconda.intf = RescueInterface(screen) anaconda.setMethod(instClass) diff --git a/urlinstall.py b/urlinstall.py index a464d9719..ce25da98b 100644 --- a/urlinstall.py +++ b/urlinstall.py @@ -82,8 +82,7 @@ class UrlInstallMethod(InstallMethod): def systemUnmounted(self): if self.loopbackFile: - isys.makeDevInode("loop0", "/tmp/loop") - isys.lochangefd("/tmp/loop", + isys.lochangefd("/dev/loop0", "%s/images/stage2.img" % (self.tree,)) self.loopbackFile = None @@ -116,8 +115,7 @@ class UrlInstallMethod(InstallMethod): os.unlink(self.loopbackFile) return 1 - isys.makeDevInode("loop0", "/tmp/loop") - isys.lochangefd("/tmp/loop", self.loopbackFile) + isys.lochangefd("/dev/loop0", self.loopbackFile) def getFilename(self, filename, callback=None, destdir=None, retry=1): |