From e0f227d0017b231b6757412969335da26f59650e Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tobias@T-POWA-LX.(none)>
Date: Mon, 29 Dec 2008 22:09:47 +0100
Subject: [PATCH] 'fix ext4 support'

---
 usr/share/archboot/base/etc/mke2fs.conf | 20 +++++++++++++++++++-
 usr/share/archboot/installer/setup      | 12 ++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/usr/share/archboot/base/etc/mke2fs.conf b/usr/share/archboot/base/etc/mke2fs.conf
index 92464e3b4..3795b1ed6 100644
--- a/usr/share/archboot/base/etc/mke2fs.conf
+++ b/usr/share/archboot/base/etc/mke2fs.conf
@@ -1,10 +1,22 @@
 [defaults]
 	base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr
 	blocksize = 4096
-	inode_size = 128
+	inode_size = 256
 	inode_ratio = 16384
 
 [fs_types]
+	ext3 = {
+		features = has_journal
+	}
+	ext4 = {
+		features = has_journal,extents,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
+		inode_size = 256
+	}
+	ext4dev = {
+		features = has_journal,extents,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize
+		inode_size = 256
+		options = test_fs=1
+	}
 	small = {
 		blocksize = 1024
 		inode_size = 128
@@ -20,7 +32,13 @@
 	}
 	largefile = {
 		inode_ratio = 1048576
+		blocksize = -1
 	}
 	largefile4 = {
 		inode_ratio = 4194304
+		blocksize = -1
+	}
+	hurd = {
+	     blocksize = 4096
+	     inode_size = 128
 	}
diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 98427cd51..1f06e7f40 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -1199,9 +1199,9 @@ dolilo() {
 			if [ -n "${_uuid}" ]; then
 				_rootpart="/dev/disk/by-uuid/${_uuid}"
 			fi
-			sed -i "s|root=.*$|append=\"root=${_rootpart} rootfs=$ROOTFS\"|g" $DESTDIR/etc/lilo.conf
+			sed -i "s|root=.*$|append=\"root=${_rootpart} rootfstype=$ROOTFS\"|g" $DESTDIR/etc/lilo.conf
 		else
-			sed -i "s|root=.*$|append=\"root=${PART_ROOT} rootfs=$ROOTFS\"|g" $DESTDIR/etc/lilo.conf
+			sed -i "s|root=.*$|append=\"root=${PART_ROOT} rootfstype=$ROOTFS\"|g" $DESTDIR/etc/lilo.conf
 		fi
 	fi
 	DEVS=$(finddisks _)
@@ -1269,9 +1269,9 @@ dogrub() {
 			fi
 			echo "root   $grubdev" >>$DESTDIR/boot/grub/menu.lst
 			if [ "$UUIDPARAMETER" = "yes" ]; then
-				echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootfs=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
+				echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootfstype=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
 			else
-				echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootfs=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
+				echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootfstype=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
 			fi
 			if [ "$VMLINUZ" = "vmlinuz26" ]; then
 				echo "initrd $subdir/kernel26.img" >>$DESTDIR/boot/grub/menu.lst
@@ -1282,9 +1282,9 @@ dogrub() {
 			echo "title  Arch Linux Fallback" >>$DESTDIR/boot/grub/menu.lst
 			echo "root   $grubdev" >>$DESTDIR/boot/grub/menu.lst
 			if [ "$UUIDPARAMETER" = "yes" ]; then
-				echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootfs=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
+				echo "kernel $subdir/$VMLINUZ root=${_rootpart} rootfstype=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
 			else
-				echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootfs=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
+				echo "kernel $subdir/$VMLINUZ root=$PART_ROOT rootfstype=$ROOTFS ro" >>$DESTDIR/boot/grub/menu.lst
 			fi
 			if [ "$VMLINUZ" = "vmlinuz26" ]; then
 				echo "initrd $subdir/kernel26-fallback.img" >>$DESTDIR/boot/grub/menu.lst