Attachment 314196 Details for Bug 444527 – ext4dev support for formatting non-system partitions in install

[patch] ext4dev support for formatting non-system partitions in install

ext4_format.patch (text/plain), 4.16 KB, created by Radek Vykydal on 2008-08-13 11:53:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Vykydal

Created: 2008-08-13 11:53:33 UTC

Size: 4.16 KB

patch

obsolete

>diff --git a/fsset.py b/fsset.py
>index 78bcdbe..310b9f7 100644
>--- a/fsset.py
>+++ b/fsset.py
>@@ -690,6 +690,55 @@ class ext3FileSystem(extFileSystem):
> 
> fileSystemTypeRegister(ext3FileSystem())
> 
>+class ext4FileSystem(extFileSystem):
>+    def __init__(self):
>+        extFileSystem.__init__(self)
>+        self.name = "ext4dev"
>+        self.linuxnativefs = 0
>+        self.partedFileSystemType = parted.file_system_type_get("ext3")
>+        
>+        self.extraFormatArgs = [ "-j", "-I", "256", "-E", "test_fs" ]
>+        self.packages = [ "e4fsprogs" ]
>+
>+        # this is tech preview at present...
>+        if flags.cmdline.has_key("ext4"):
>+            self.supported = -1
>+        else:
>+            self.supported = 0
>+ 
>+    def labelDevice(self, entry, chroot):
>+        devicePath = entry.device.setupDevice(chroot)
>+        label = labelFactory.createLabel(entry.mountpoint, self.maxLabelChars,
>+                                         kslabel = entry.label)
>+
>+        rc = iutil.execWithRedirect("/usr/sbin/e4label",
>+                                    [devicePath, label],
>+                                    stdout = "/dev/tty5",
>+                                    stderr = "/dev/tty5")
>+        if rc:
>+            raise SystemError
>+        entry.setLabel(label)
>+        
>+    def formatDevice(self, entry, progress, chroot='/'):
>+        devicePath = entry.device.setupDevice(chroot)
>+        devArgs = self.getDeviceArgs(entry.device)
>+        args = [ "/usr/sbin/mke4fs", devicePath, "-i", str(entry.bytesPerInode) ]
>+
>+        args.extend(devArgs)
>+        args.extend(self.extraFormatArgs)
>+
>+	log.info("Format command:  %s\n" % str(args))
>+
>+        rc = ext2FormatFilesystem(args, "/dev/tty5",
>+                                  progress,
>+                                  entry.mountpoint)
>+        if rc:
>+            raise SystemError
>+
>+        extFileSystem.setExt3Options(self, entry, progress, chroot)
>+ 
>+fileSystemTypeRegister(ext4FileSystem())
>+
> class raidMemberDummyFileSystem(FileSystemType):
>     def __init__(self):
>         FileSystemType.__init__(self)
>diff --git a/loader2/loader.c b/loader2/loader.c
>index 905177e..226d483 100644
>--- a/loader2/loader.c
>+++ b/loader2/loader.c
>@@ -1660,7 +1660,7 @@ int main(int argc, char ** argv) {
>     else if (FL_UPDATES(flags))
>         loadUpdates(&loaderData);
> 
>-    mlLoadModuleSet("md:raid0:raid1:raid5:raid6:raid456:fat:msdos:jbd:ext3:lock_nolock:gfs2:reiserfs:jfs:xfs:dm-mod:dm-zero:dm-mirror:dm-snapshot:dm-multipath:dm-round-robin:dm-emc", modLoaded, modDeps, modInfo);
>+    mlLoadModuleSet("md:raid0:raid1:raid5:raid6:raid456:fat:msdos:jbd2:crc16:ext4dev:jbd:ext3:lock_nolock:gfs2:reiserfs:jfs:xfs:dm-mod:dm-zero:dm-mirror:dm-snapshot:dm-multipath:dm-round-robin:dm-emc", modLoaded, modDeps, modInfo);
> 
>     usbInitializeMouse(modLoaded, modDeps, modInfo);
> 
>diff --git a/partitions.py b/partitions.py
>index 96b0cd9..db46b77 100644
>--- a/partitions.py
>+++ b/partitions.py
>@@ -1021,6 +1021,12 @@ class Partitions:
>                     errors.append("Bootable partitions cannot be on a GFS2 "
>                                   "filesystem.")
>                     
>+                # no ext4dev support in grub
>+                if (bootreq and bootreq.fstype and
>+                    bootreq.fstype.getName() == "ext4dev"):
>+                    errors.append("Bootable partitions cannot be on an ext4dev "
>+                                  "filesystem.")
>+                    
> 
>         if foundSwap == 0:
>             warnings.append(_("You have not specified a swap partition.  "
>diff --git a/scripts/mk-images b/scripts/mk-images
>index c2bc3bc..26a1bd5 100755
>--- a/scripts/mk-images
>+++ b/scripts/mk-images
>@@ -42,7 +42,7 @@ USBMODS="ohci-hcd uhci-hcd ehci-hcd hid mousedev usb-storage sd_mod sr_mod ub"
> FIREWIREMODS="ieee1394 ohci1394 sbp2"
> IDEMODS="ide-cd"
> SCSIMODS="sr_mod sg st sd_mod scsi_mod iscsi_tcp iscsi_ibft"
>-FSMODS="fat msdos vfat ext3 reiserfs jfs xfs gfs2 lock_nolock"
>+FSMODS="fat msdos vfat ext3 ext4dev reiserfs jfs xfs gfs2 lock_nolock"
> LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-emc dm-crypt"
> RAIDMODS="md raid0 raid1 raid5 raid6 raid456"
> SECSTAGE="$RAIDMODS $LVMMODS $FSMODS $IDEMODS $SCSIMODS"

Actions: View | Diff

Attachments on bug 444527: 314196 | 314198 | 314540 | 314545 | 314546