ext4dev -> ext4 (esandeen).

4 files changed, 6 insertions, 16 deletions

diff --git a/fsset.py b/fsset.py
index ea2ac6b11..4522795eb 100644
--- a/fsset.py
+++ b/fsset.py
@@ -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...
diff --git a/isys/isys.py b/isys/isys.py
index 57672d8f6..05e0806c9 100755
--- a/isys/isys.py
+++ b/isys/isys.py
@@ -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
diff --git a/loader/loader.c b/loader/loader.c
index 64dee00aa..f5e1db678 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1882,7 +1882,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))
diff --git a/scripts/mk-images b/scripts/mk-images
index be566e024..fe84354e7 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -112,7 +112,7 @@ FIREWIREMODS="ohci1394 sbp2 fw-ohci fw-sbp2 firewire-sbp2 firewire-ohci"
 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"