fstab: Make auto attribute for filesystem type.

diff --git a/config/etc/fstab b/config/etc/fstab
index 0cd30ebe9b604d3bab63cbdde753a20f23e52eee..775f619b04e04e931821600a62094886827b37a5 100644 (file)
--- 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 6a336135424143faa13fb265a0b4905db2b63b05..d5fe422df3e203488167ae85c77bba00365961ca 100644 (file)
--- 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);