It looks like upstream will be renaming ext4dev to ext4 in 2.6.28.
I plan to pull in this change (as well as the other 2.6.28-destined
patches) for F10, so anaconda will need a change as well.
I must admit that this isn't tested yet :) My anaconda-fu is weak, and I'm
not sure how to test all these changes on my own, w/o an anaconda respin.
(I'm also inclined to remove or comment out the ext3->ext4 migration path,
I don't think that has ever gotten the love it needs in order to work, yet?)
Thanks,
-Eric
Index: anaconda-11.4.1.44/fsset.py
===================================================================
--- anaconda-11.4.1.44.orig/fsset.py 2008-10-06 21:31:16.000000000 -0500
+++ anaconda-11.4.1.44/fsset.py 2008-10-07 10:14:33.135001446 -0500
@@ -689,7 +689,7 @@ class ext3FileSystem(extFileSystem):
self.extraFormatArgs = [ "-t", "ext3" ]
self.partedFileSystemType = parted.file_system_type_get("ext3")
if flags.cmdline.has_key("ext4"):
- self.migratetofs = ['ext4dev']
+ self.migratetofs = ['ext4']
def formatDevice(self, entry, progress, chroot='/'):
extFileSystem.formatDevice(self, entry, progress, chroot)
@@ -701,26 +701,18 @@ class ext3FileSystem(extFileSystem):
if not entry.fsystem or not entry.origfsystem:
raise RuntimeError, ("Trying to migrate fs w/o fsystem or "
"origfsystem set")
- if entry.fsystem.getName() != "ext4dev":
+ if entry.fsystem.getName() != "ext4":
raise RuntimeError, ("Trying to migrate ext3 to something other "
"than ext4")
- # This is only needed as long as ext4 is actually "ext4dev"
- rc = iutil.execWithRedirect("tune2fs",
- ["-E", "test_fs", devicePath ],
- stdout = "/dev/tty5",
- stderr = "/dev/tty5", searchPath = 1)
- if rc:
- raise SystemError
-
fileSystemTypeRegister(ext3FileSystem())
class ext4FileSystem(extFileSystem):
def __init__(self):
extFileSystem.__init__(self)
- self.name = "ext4dev"
+ self.name = "ext4"
self.partedFileSystemType = parted.file_system_type_get("ext3")
- self.extraFormatArgs = [ "-t", "ext4dev" ]
+ self.extraFormatArgs = [ "-t", "ext4" ]
self.bootable = False
# this is way way experimental at present...
Index: anaconda-11.4.1.44/isys/isys.py
===================================================================
--- anaconda-11.4.1.44.orig/isys/isys.py 2008-10-06 21:31:16.000000000 -0500
+++ anaconda-11.4.1.44/isys/isys.py 2008-10-07 10:15:02.954001222 -0500
@@ -772,8 +772,6 @@ def readFSType(device):
continue
if buf[off:].startswith("LVM2"):
return "physical volume (LVM)"
- if fstype == "ext4":
- return "ext4dev"
elif fstype == "lvm2pv":
return "physical volume (LVM)"
return fstype
Index: anaconda-11.4.1.44/loader/loader.c
===================================================================
--- anaconda-11.4.1.44.orig/loader/loader.c 2008-10-06 21:31:16.000000000 -0500
+++ anaconda-11.4.1.44/loader/loader.c 2008-10-07 10:15:13.221002579 -0500
@@ -1935,7 +1935,7 @@ int main(int argc, char ** argv) {
if (isVioConsole())
setenv("TERM", "vt100", 1);
- mlLoadModuleSet("cramfs:vfat:nfs:floppy:edd:pcspkr:squashfs:ext4dev:ext2:iscsi_tcp:iscsi_ibft");
+ mlLoadModuleSet("cramfs:vfat:nfs:floppy:edd:pcspkr:squashfs:ext4:ext2:iscsi_tcp:iscsi_ibft");
#ifdef ENABLE_IPV6
if (!FL_NOIPV6(flags))
Index: anaconda-11.4.1.44/scripts/mk-images
===================================================================
--- anaconda-11.4.1.44.orig/scripts/mk-images 2008-10-06 21:31:16.000000000 -0500
+++ anaconda-11.4.1.44/scripts/mk-images 2008-10-07 10:15:21.357001307 -0500
@@ -112,7 +112,7 @@ FIREWIREMODS="ohci1394 sbp2 fw-ohci fw-s
SDMODS="mmc-block sdhci sdhci-pci"
IDEMODS="ide-cd ide-cd_mod"
SCSIMODS="sr_mod sg st sd_mod scsi_mod iscsi_tcp iscsi_ibft"
-FSMODS="fat msdos vfat ext2 ext3 ext4dev reiserfs jfs xfs gfs2 cifs"
+FSMODS="fat msdos vfat ext2 ext3 ext4 reiserfs jfs xfs gfs2 cifs"
LVMMODS="dm-mod dm-zero dm-snapshot dm-mirror dm-multipath dm-round-robin dm-crypt"
RAIDMODS="raid0 raid1 raid5 raid6 raid456 raid10 linear"
CRYPTOMODS="sha256_generic cbc xts lrw aes_generic crypto_blkcipher crc32c ecb arc4"
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
