Merge lp:~barry/ubuntu/lucid/system-config-lvm/390423-ext4-support into lp:ubuntu/lucid/system-config-lvm

[Barry Warsaw]

[Barry Warsaw (barry)]

Resolves bug 390423 providing ext4 support to system-config-lvm for Lucid by applying upstream patch.

Tested by creating a virtual disk in my Lucid VM, using system-config-lvm to put an ext4 file system on it, and checking the results with the normal file system tools.

[Colin Watson (cjwatson)]

All looks fine to me. Thanks! Sponsoring.

review: Approve

[Colin Watson (cjwatson)]

As explained on IRC, this package uses a patch system, so the upstream part of this change needs to be reformatted to match that.

review: Needs Fixing

[lp:~barry/ubuntu/lucid/system-config-lvm/390423-ext4-support]

11. By Barry Warsaw on 2009-12-11

Move the patch into a dpatch file.

12. By Barry Warsaw on 2009-12-11

Back out the patch from the source branch, in favor of the dpatch.

13. By Barry Warsaw on 2009-12-11

Rename file for proper dpatch convention.

14. By Barry Warsaw on 2009-12-11

Give the directory prefix expected by dpatch.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2009-07-02 11:09:51 +0000
+++ debian/changelog	2009-12-10 21:09:14 +0000
@@ -1,3 +1,10 @@
+system-config-lvm (1.1.4-4ubuntu2) lucid; urgency=low
+
+  * Add support for ext4 and xfs via patch in upstream tracker
+    (thanks, Andres Mujica; LP: #390423)
+
+ -- Barry A. Warsaw <[e-mail]>  Thu, 10 Dec 2009 10:56:03 -0500
+
 system-config-lvm (1.1.4-4ubuntu1) karmic; urgency=low
 
   * In Ubuntu, we use udev rather than an init script to activate lvm2, so

=== modified file 'src/Filesystem.py'
--- src/Filesystem.py	2008-05-27 13:11:19 +0000
+++ src/Filesystem.py	2009-12-10 21:09:14 +0000
@@ -42,8 +42,6 @@
         return Unknown('vfat32')
     elif re.search('minix', result, re.I):
         return Unknown('minix')
-    elif re.search('xfs', result, re.I):
-        return Unknown('xfs')
     elif re.search('jfs', result, re.I):
         return Unknown('jfs')
     elif re.search('reiserfs', result, re.I):
@@ -56,7 +54,7 @@
 
 def get_filesystems():
     # NoFS has to be first
-    return [NoFS(), ext3(), ext2(), gfs2(), gfs2_clustered(), gfs(), gfs_clustered()]
+    return [NoFS(), ext4(), ext3(), ext2(), gfs2(), gfs2_clustered(), gfs(), gfs_clustered(), xfs()]
 
 
 class Filesystem:
@@ -146,6 +144,112 @@
                             'unknown')
         
         
+class ext4(Filesystem):
+    def __init__(self):
+        creatable = self.check_path('/sbin/mkfs.ext4')
+        mountable = self.check_mountable('ext4', 'ext4')
+        resize_offline = self.check_paths(['/sbin/e2fsck', '/sbin/resize2fs'])
+        extend_online = self.check_path('/sbin/resize2fs')
+
+        Filesystem.__init__(self, 'Ext4', creatable, True, mountable,
+                            extend_online, resize_offline, False, resize_offline,
+                            'ext4')
+
+
+    def probe(self, path):
+        result = execWithCapture("/usr/bin/file", ['/usr/bin/file', '-s', '-L', path])
+        if re.search('ext4', result, re.I):
+            return True
+
+    # Note, you may need a test for new-enough e2fsprogs for ext4
+    def create(self, path):
+        args = list()
+        args.append("/sbin/mkfs")
+        args.append("-t")
+        args.append('ext4')
+        args.append(path)
+        cmdstr = ' '.join(args)
+        msg = CREATING_FS % (self.name)
+        o,e,r = execWithCaptureErrorStatusProgress("/sbin/mkfs", args, msg)
+        if r != 0:
+            raise CommandError('FATAL', FSCREATE_FAILURE % (cmdstr,e))
+
+    def extend_online(self, dev_path):
+        cmd = '/sbin/resize2fs'
+        args = [cmd, dev_path]
+        cmdstr = ' '.join(args)
+        msg = RESIZING_FS % (self.name)
+        o, e, s = execWithCaptureErrorStatusProgress(cmd, args, msg)
+        if s != 0:
+            raise CommandError('FATAL', FSRESIZE_FAILURE % (cmdstr, e))
+
+    def reduce_online(self, dev_path, new_size_bytes):
+        # not supported
+        raise 'NOT supported'
+
+    def extend_offline(self, dev_path):
+        # first check fs (resize2fs requirement)
+        args = list()
+        args.append('/sbin/e2fsck')
+        args.append('-f')
+        args.append('-p') # repair fs
+        args.append(dev_path)
+        cmdstr = ' '.join(args)
+        msg = CHECKING_FS % self.name
+        o,e,r = execWithCaptureErrorStatusProgress('/sbin/e2fsck', args, msg)
+        if not (r==0 or r==1):
+            raise CommandError('FATAL', FSCHECK_FAILURE % (cmdstr,e))
+
+        args = list()
+        args.append('/sbin/resize2fs')
+        args.append(dev_path)
+        cmdstr = ' '.join(args)
+        msg = RESIZING_FS % self.name
+        o,e,r = execWithCaptureErrorStatusProgress('/sbin/resize2fs', args, msg)
+        if r != 0:
+            raise CommandError('FATAL', FSRESIZE_FAILURE % (cmdstr,e))
+
+    def reduce_offline(self, dev_path, new_size_bytes):
+        # first check fs (resize2fs requirement)
+        args = list()
+        args.append('/sbin/e2fsck')
+        args.append('-f')
+        args.append('-p') # repair fs
+        args.append(dev_path)
+        cmdstr = ' '.join(args)
+        msg = CHECKING_FS % self.name
+        o,e,r = execWithCaptureErrorStatusProgress('/sbin/e2fsck', args, msg)
+        if not (r==0 or r==1):
+            raise CommandError('FATAL', FSCHECK_FAILURE % (cmdstr,e))
+
+        new_size_kb = new_size_bytes / 1024
+        args = list()
+        args.append('/sbin/resize2fs')
+        args.append(dev_path)
+        args.append(str(new_size_kb) + 'K')
+        cmdstr = ' '.join(args)
+        msg = RESIZING_FS % (self.name)
+        o,e,r = execWithCaptureErrorStatusProgress('/sbin/resize2fs', args, msg)
+        if r != 0:
+            raise CommandError('FATAL', FSRESIZE_FAILURE % (cmdstr,e))
+
+    def get_label(self, devpath):
+        args = ['/sbin/tune2fs']
+        args.append('-l')
+        args.append(devpath)
+        o, r = execWithCaptureStatus('/sbin/tune2fs', args)
+        if r == 0:
+            lines = o.splitlines()
+            for line in lines:
+                if re.search('volume name', line, re.I):
+                    words = line.split()
+                    label = words[len(words) - 1]
+                    if re.match('<none>', label, re.I):
+                        return None
+                    else:
+                        return label
+        return None
+
 class ext3(Filesystem):
     def __init__(self):
         creatable = self.check_path('/sbin/mkfs.ext3')
@@ -652,6 +756,66 @@
                         return v
         return None
 
+class xfs(Filesystem):
+    def __init__(self):
+        creatable = self.check_path('/sbin/mkfs.xfs')
+        mountable = self.check_mountable('xfs', 'xfs')
+        extend_online = self.check_path('/usr/sbin/xfs_growfs')
+
+        Filesystem.__init__(self, 'XFS', creatable, True, mountable,
+                            extend_online, False, False, False,
+                            'xfs')
+
+    def probe(self, path):
+        result = execWithCapture("/usr/bin/file", ['/usr/bin/file', '-s', '-L', path])
+        if re.search('SGI XFS', result, re.I):
+            return True
+
+    def create(self, path):
+        args = list()
+        args.append("/sbin/mkfs")
+        args.append("-t")
+        args.append('xfs')
+        args.append(path)
+        cmdstr = ' '.join(args)
+        msg = CREATING_FS % (self.name)
+        o,e,r = execWithCaptureErrorStatusProgress("/sbin/mkfs", args, msg)
+        if r != 0:
+            raise CommandError('FATAL', FSCREATE_FAILURE % (cmdstr,e))
+
+    def extend_online(self, dev_path):
+        cmd = '/usr/sbin/xfs_growfs'
+        args = [cmd, dev_path]
+        cmdstr = ' '.join(args)
+        msg = RESIZING_FS % (self.name)
+        o, e, s = execWithCaptureErrorStatusProgress(cmd, args, msg)
+        if s != 0:
+            raise CommandError('FATAL', FSRESIZE_FAILURE % (cmdstr, e))
+
+    def reduce_online(self, dev_path, new_size_bytes):
+        # not supported
+        raise 'NOT supported'
+
+    def extend_offline(self, dev_path):
+        # not supported
+        raise 'NOT supported'
+
+    def reduce_offline(self, dev_path, new_size_bytes):
+        # not supported
+        raise 'NOT supported'
+
+    def get_label(self, devpath):
+        args = ['/usr/sbin/xfs_admin']
+        args.append('-l')
+        args.append(devpath)
+        o, r = execWithCaptureStatus('/usr/sbin/xfs_admin', args)
+        if r == 0:
+            words = o.split()
+            label = re.sub('\"', '', words[len(words) - 1])
+            if label:
+                return label
+            return None
+        return None