diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | dmraid.py | 10 | ||||
| -rw-r--r-- | fsset.py | 21 | ||||
| -rw-r--r-- | isys/isys.py | 2 | ||||
| -rw-r--r-- | partedUtils.py | 11 | ||||
| -rw-r--r-- | raid.py | 5 |
6 files changed, 23 insertions, 31 deletions
@@ -1,3 +1,8 @@ +2007-10-24 Chris Lumens <clumens@redhat.com> + + * dmraid.py, fsset.py, partedUtils.py, raid.py, isys/isys.py: Clean + up usage of /tmp for device nodes (patch from notting@redhat.com). + 2007-10-24 Peter Jones <pjones@redhat.com> * scripts/upd-instroot: Use the newest ld.so we find, not the oldest, @@ -122,11 +122,8 @@ def scanForRaid(drives, degradedOk=False): probeDrives = [] for d in drives: - dp = "/dev/" + d - isys.makeDevInode(d, dp) + dp = isys.makeDevInode(d) probeDrives.append(dp) - dp = "/tmp/" + d - isys.makeDevInode(d, dp) dmsets = [] def nonDegraded(rs): @@ -240,11 +237,8 @@ def scanForMPath(drives): probeDrives = [] for d in drives: - dp = "/dev/" + d - isys.makeDevInode(d, dp) + dp = isys.makeDevInode(d) probeDrives.append(dp) - dp = "/tmp/" + d - isys.makeDevInode(d, dp) import block as _block oldPath = _block.getBdevidPath() @@ -1823,7 +1823,7 @@ class FileSystemSetEntry: self.format = format self.bytesPerInode = bytesPerInode - def mount(self, chroot='/', devPrefix='/tmp', readOnly = 0): + def mount(self, chroot='/', devPrefix='/dev', readOnly = 0): device = self.device.setupDevice(chroot, devPrefix=devPrefix) # FIXME: we really should migrate before turnOnFilesystems. @@ -1921,10 +1921,10 @@ class Device: def getDevice (self, asBoot = 0): return self.device - def setupDevice (self, chroot='/', devPrefix='/tmp'): + def setupDevice (self, chroot='/', devPrefix='/dev/'): return self.device - def cleanupDevice (self, chroot, devPrefix='/tmp'): + def cleanupDevice (self, chroot, devPrefix='/dev/'): pass def solidify (self): @@ -2144,7 +2144,7 @@ class VolumeGroupDevice(Device): self.physicalextentsize = pesize - def setupDevice (self, chroot="/", devPrefix='/tmp'): + def setupDevice (self, chroot="/", devPrefix='/dev/'): nodes = [] for volume in self.physicalVolumes: # XXX the lvm tools are broken and will only work for /dev @@ -2188,7 +2188,7 @@ class LogicalVolumeDevice(Device): # self.extents # self.readaheadsectors - def setupDevice(self, chroot="/", devPrefix='/tmp', vgdevice = None): + def setupDevice(self, chroot="/", devPrefix='/dev', vgdevice = None): if not self.isSetup: lvm.lvcreate(self.name, self.vgname, self.size) self.isSetup = 1 @@ -2216,7 +2216,7 @@ class PartitionDevice(Device): if isys.driveIsIscsi(disk): self.setAsNetdev() - def setupDevice(self, chroot="/", devPrefix='/tmp'): + def setupDevice(self, chroot="/", devPrefix='/dev'): path = '%s/%s' % (devPrefix, self.getDevice(),) isys.makeDevInode(self.getDevice(), path) return path @@ -2258,7 +2258,7 @@ class SwapFileDevice(Device): def setSize (self, size): self.size = size - def setupDevice (self, chroot="/", devPrefix='/tmp'): + def setupDevice (self, chroot="/", devPrefix='/dev'): file = os.path.normpath(chroot + self.getDevice()) if not os.access(file, os.R_OK): if self.size: @@ -2280,7 +2280,7 @@ class PiggybackSwapFileDevice(SwapFileDevice): SwapFileDevice.__init__(self, file) self.piggypath = piggypath - def setupDevice(self, chroot="/", devPrefix='/tmp'): + def setupDevice(self, chroot="/", devPrefix='/dev'): return SwapFileDevice.setupDevice(self, self.piggypath, devPrefix) class LoopbackDevice(Device): @@ -2290,7 +2290,7 @@ class LoopbackDevice(Device): self.hostfs = hostFs self.device = "loop1" - def setupDevice(self, chroot="/", devPrefix='/tmp/'): + def setupDevice(self, chroot="/", devPrefix='/dev/'): if not self.isSetup: isys.mount(self.host[5:], "/mnt/loophost", fstype = "vfat") self.device = allocateLoopback("/mnt/loophost/redhat.img") @@ -2476,9 +2476,8 @@ def getDevFD(device): try: fd = os.open(device, os.O_RDONLY) except: - file = '/tmp/' + device try: - isys.makeDevInode(device, file) + file = isys.makeDevInode(device) fd = os.open(file, os.O_RDONLY) except: return -1 diff --git a/isys/isys.py b/isys/isys.py index 5628f8a70..3a4554c03 100644 --- a/isys/isys.py +++ b/isys/isys.py @@ -615,7 +615,7 @@ def makeDevInode(name, fn=None): try: os.stat(path) except OSError: - path = '/tmp/%s' % (name,) + path = '/dev/%s' % (name,) _isys.mkdevinode(name, path) return path diff --git a/partedUtils.py b/partedUtils.py index 6d776539b..f952cfab2 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -444,12 +444,7 @@ def sniffFilesystemType(device): if os.access(device, os.O_RDONLY): dev = device else: - dev = "/tmp/" + device - if not os.access(dev, os.O_RDONLY): - try: - isys.makeDevInode(device, dev) - except: - pass + dev = isys.makeDevInode(device) pagesize = resource.getpagesize() if pagesize > 2048: @@ -970,7 +965,7 @@ class DiskSet: _("Please wait while formatting drive %s...\n" ) % (drive,), 100) try: - isys.makeDevInode(drive, '/tmp/' + drive) + dev = isys.makeDevInode(drive) except: pass @@ -980,7 +975,7 @@ class DiskSet: "-d", "cdl", "-F", "-f", - "/tmp/%s" % drive] + dev] fd = os.open("/dev/null", os.O_RDWR | os.O_CREAT | os.O_APPEND) p = os.pipe() @@ -65,9 +65,9 @@ def scanForRaid(drives): for d in drives: parts = [] - isys.makeDevInode(d, "/tmp/" + d) + dp = isys.makeDevInode(d) try: - dev = parted.PedDevice.get("/tmp/" + d) + dev = parted.PedDevice.get(dp) disk = parted.PedDisk.new(dev) raidParts = partedUtils.get_raid_partitions(disk) @@ -76,7 +76,6 @@ def scanForRaid(drives): except: pass - os.remove("/tmp/" + d) for dev in parts: try: (major, minor, raidSet, level, nrDisks, totalDisks, mdMinor) =\ |