From 2c4536c75b7f013c3cdc997810c207149ca1977c Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 Jul 2014 00:34:42 +0200
Subject: [PATCH] fstab: Make auto attribute for filesystem type.

---
 config/etc/fstab                 |  6 +++---
 src/install+setup/install/main.c | 14 --------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/config/etc/fstab b/config/etc/fstab
index 0cd30ebe9..775f619b0 100644
--- a/config/etc/fstab
+++ b/config/etc/fstab
@@ -1,9 +1,9 @@
 #
 # file system  mount-point  type     options         dump  fsck
 #                                                        order
-DEVICE1	/boot	ext2	defaults	1	2
+DEVICE1	/boot	auto	defaults	1	2
 DEVICE2	 swap	swap	pri=1	0	0
-DEVICE3	/	FSTYPE	defaults	1	1
-DEVICE4	/var	FSTYPE	defaults	1	1
+DEVICE3	/	auto	defaults	1	1
+DEVICE4	/var	auto	defaults	1	1
 none	/var/log/rrd	tmpfs	defaults,size=64M	0	0
 none	/var/lock	tmpfs	defaults,size=8M	0	0
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 6a3361354..d5fe422df 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -528,20 +528,6 @@ int main(int argc, char *argv[]) {
 	snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE4#UUID=$(/sbin/blkid %s -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", destination->part_data);
 	system(commandstring);
 
-	switch (destination->filesystem) {
-		case HW_FS_REISERFS:
-			replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
-			break;
-
-		case HW_FS_EXT4:
-		case HW_FS_EXT4_WO_JOURNAL:
-			replace("/harddisk/etc/fstab", "FSTYPE", "ext4");
-			break;
-
-		default:
-			assert(0);
-	}
-
 	replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
 
 	snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#root=ROOT#root=UUID=$(/sbin/blkid %s -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/boot/grub/grub.conf", destination->part_root);