[Fedora-livecd-list] [PATCH] added compat shims in fs.py for old api
David Huff
dhuff at redhat.com
Mon Jul 21 21:26:56 UTC 2008
Compat shims switching over the old classes, LoopbackMount, SparseLoopbackMount, SparseExtLoopbackMount, types to sit on top of the new Disk and Mount classes.
---
imgcreate/fs.py | 166 ++++++++----------------------------------------------
1 files changed, 25 insertions(+), 141 deletions(-)
diff --git a/imgcreate/fs.py b/imgcreate/fs.py
index 16cbbba..6de99fd 100644
--- a/imgcreate/fs.py
+++ b/imgcreate/fs.py
@@ -88,32 +88,16 @@ class BindChrootMount:
self.mounted = False
class LoopbackMount:
+ """LoopbackMount compatibility layer for old API"""
def __init__(self, lofile, mountdir, fstype = None):
- self.lofile = lofile
- self.mountdir = mountdir
- self.fstype = fstype
-
- self.mounted = False
+ DiskMount.__init__(LoopbackDisk(lofile,size = 0),mountdir,fstype,rmmountdir = True)
self.losetup = False
- self.rmdir = False
- self.loopdev = None
-
+
def cleanup(self):
- self.unmount()
- self.lounsetup()
+ DiskMount.cleanup(self)
def unmount(self):
- if self.mounted:
- rc = subprocess.call(["/bin/umount", self.mountdir])
- if rc == 0:
- self.mounted = False
-
- if self.rmdir and not self.mounted:
- try:
- os.rmdir(self.mountdir)
- except OSError, e:
- pass
- self.rmdir = False
+ DiskMount.unmount(self)
def lounsetup(self):
if self.losetup:
@@ -143,152 +127,52 @@ class LoopbackMount:
self.losetup = True
def mount(self):
- if self.mounted:
- return
-
- self.loopsetup()
-
- if not os.path.isdir(self.mountdir):
- os.makedirs(self.mountdir)
- self.rmdir = True
-
- args = [ "/bin/mount", self.loopdev, self.mountdir ]
- if self.fstype:
- args.extend(["-t", self.fstype])
-
- rc = subprocess.call(args)
- if rc != 0:
- raise MountError("Failed to mount '%s' to '%s'" %
- (self.loopdev, self.mountdir))
-
- self.mounted = True
+ DiskMount.mount(self)
class SparseLoopbackMount(LoopbackMount):
+ """LoopbackMount compatibility layer for old API"""
def __init__(self, lofile, mountdir, size, fstype = None):
- LoopbackMount.__init__(self, lofile, mountdir, fstype)
- self.size = size
+ DiskMount.__init__(SparseLoopbackDisk(lofile,size),mountdir,fstype,rmmountdir = True)
def expand(self, create = False, size = None):
- flags = os.O_WRONLY
- if create:
- flags |= os.O_CREAT
- makedirs(os.path.dirname(self.lofile))
-
- if size is None:
- size = self.size
-
- fd = os.open(self.lofile, flags)
-
- os.lseek(fd, size, 0)
- os.write(fd, '\x00')
- os.close(fd)
+ SparseLoopbackDisk.expand(self, create, size)
def truncate(self, size = None):
- if size is None:
- size = self.size
- fd = os.open(self.lofile, os.O_WRONLY)
- os.ftruncate(fd, size)
- os.close(fd)
+ SparseLoopbackDisk.truncate(self, size)
def create(self):
- self.expand(create = True)
+ SparseLoopbackDisk.create(self)
class SparseExtLoopbackMount(SparseLoopbackMount):
+ """LoopbackMount compatibility layer for old API"""
def __init__(self, lofile, mountdir, size, fstype, blocksize, fslabel):
- SparseLoopbackMount.__init__(self, lofile, mountdir, size, fstype)
- self.blocksize = blocksize
- self.fslabel = fslabel
+ ExtDiskMount.__init__(SparseLoopbackDisk(lofile,size), mountdir, fstype, blocksize, fslabel, rmmountdir = True)
+
def __format_filesystem(self):
- rc = subprocess.call(["/sbin/mkfs." + self.fstype,
- "-F", "-L", self.fslabel,
- "-m", "1", "-b", str(self.blocksize),
- self.lofile,
- str(self.size / self.blocksize)])
- if rc != 0:
- raise MountError("Error creating %s filesystem" % (self.fstype,))
- subprocess.call(["/sbin/tune2fs", "-c0", "-i0", "-Odir_index",
- "-ouser_xattr,acl", self.lofile])
+ ExtDiskMount.__format_filesystem(self)
def create(self):
- SparseLoopbackMount.create(self)
- self.__format_filesystem()
+ SparseLoopbackDisk.create(self)
def resize(self, size = None):
- current_size = os.stat(self.lofile)[stat.ST_SIZE]
-
- if size is None:
- size = self.size
-
- if size == current_size:
- return
-
- if size > current_size:
- self.expand(size)
-
- self.__fsck()
-
- resize2fs(self.lofile, size)
-
- if size < current_size:
- self.truncate(size)
- return size
+ ExtDiskMount.__resize_filesystem(self, size)
def mount(self):
- if not os.path.isfile(self.lofile):
- self.create()
- else:
- self.resize()
- return SparseLoopbackMount.mount(self)
-
+ ExtDiskMount.mount(self)
+
def __fsck(self):
- subprocess.call(["/sbin/e2fsck", "-f", "-y", self.lofile])
+ ExtDiskMount.__fsck(self)
def __get_size_from_filesystem(self):
- def parse_field(output, field):
- for line in output.split("\n"):
- if line.startswith(field + ":"):
- return line[len(field) + 1:].strip()
-
- raise KeyError("Failed to find field '%s' in output" % field)
-
- dev_null = os.open("/dev/null", os.O_WRONLY)
- try:
- out = subprocess.Popen(['/sbin/dumpe2fs', '-h', self.lofile],
- stdout = subprocess.PIPE,
- stderr = dev_null).communicate()[0]
- finally:
- os.close(dev_null)
-
- return int(parse_field(out, "Block count")) * self.blocksize
-
+ ExtDiskMount.__get_size_from_filesystem(self)
+
def __resize_to_minimal(self):
- self.__fsck()
-
- #
- # Use a binary search to find the minimal size
- # we can resize the image to
- #
- bot = 0
- top = self.__get_size_from_filesystem()
- while top != (bot + 1):
- t = bot + ((top - bot) / 2)
-
- if not resize2fs(self.lofile, t):
- top = t
- else:
- bot = t
- return top
-
+ ExtDiskMount.__resize_to_minimal(self)
+
def resparse(self, size = None):
- self.cleanup()
+ ExtDiskMount.resparse(self, size)
- minsize = self.__resize_to_minimal()
-
- self.truncate(minsize)
- self.resize(size)
- return minsize
-
class Disk:
"""
With the new disk API the image being produced can be partitioned into
--
1.5.4.1
More information about the Fedora-livecd-list
mailing list