Add ext4 support to installer.

[people/pmueller/ipfire-2.x.git] / src / install+setup / install / main.c

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index a46de921f70bebbe9aafd46712c3c97f5a42d578..1f615d0d63c74166f30dbde4d99234b0c46b8524 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -15,8 +15,9 @@
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 #define EXT2 0
-#define REISERFS 2
 #define EXT3 1
+#define EXT4 2
+#define REISERFS 3
 
 FILE *flog = NULL;
 char *mylog;
@@ -35,6 +36,9 @@ extern char *fr_tr[];
 
 int main(int argc, char *argv[])
 {
+
+       char discl_msg[40000] = "Disclaimer\n";
+
        char *langnames[] = { "Deutsch", "English", "Français", "Español", NULL };
        char *shortlangnames[] = { "de", "en", "fr", "es", NULL };
        char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL };
@@ -44,8 +48,8 @@ int main(int argc, char *argv[])
        int rc = 0;
        char commandstring[STRING_SIZE];
        char mkfscommand[STRING_SIZE];
-       char *fstypes[] = { "ext2", "ext3", "ReiserFS", NULL };
-       int fstype = REISERFS;
+       char *fstypes[] = { "ext2", "ext3", "ext4", "ReiserFS", NULL };
+       int fstype = EXT3;
        int choice;
        int i;
        int found = 0;
@@ -57,7 +61,7 @@ int main(int argc, char *argv[])
        int allok_fastexit=0;
        int raid_disk = 0;
        struct keyvalue *ethernetkv = initkeyvalues();
-       FILE *handle, *cmdfile;
+       FILE *handle, *cmdfile, *copying;
        char line[STRING_SIZE];
        char string[STRING_SIZE];
        long memory = 0, disk = 0, free;
@@ -108,6 +112,16 @@ int main(int argc, char *argv[])
                }               
        }
 
+       // Read gpl ...
+       if (! (copying = fopen("/COPYING", "r")))
+       {
+               fprintf(flog,      "Couldn't open gpl (/COPYING)\n");
+               sprintf(discl_msg, "Couldn't open gpl (/COPYING)\n");
+       } else {
+               fread(discl_msg, 1, 40000, copying);
+               fclose(copying);
+       }
+
        // Load common modules
        mysystem("/sbin/modprobe iso9660"); // CDROM
        mysystem("/sbin/modprobe ext2"); // Boot patition
@@ -135,6 +149,13 @@ int main(int argc, char *argv[])
        sprintf(message, ctr[TR_WELCOME], NAME);
        newtWinMessage(title, ctr[TR_OK], message);
 
+       if (!unattended) {
+               if (disclaimerbox(discl_msg)==0) {
+                       errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]);
+                       goto EXIT;
+               }
+       }
+
        switch (mysystem("/bin/mountsource.sh")) {
            case 0:
                                break;
@@ -233,6 +254,12 @@ int main(int argc, char *argv[])
        if (rc == 2)
                goto EXIT;
 
+       fstypes[0]=ctr[TR_EXT2FS_DESCR];
+       fstypes[1]=ctr[TR_EXT3FS_DESCR];
+       fstypes[2]=ctr[TR_EXT4FS_DESCR];
+       fstypes[3]=ctr[TR_REISERFS_DESCR];
+       fstypes[4]=NULL;
+
        if (!unattended) {              
                sprintf(message, ctr[TR_CHOOSE_FILESYSTEM]);
                rc = newtWinMenu( ctr[TR_CHOOSE_FILESYSTEM], message,
@@ -240,7 +267,7 @@ int main(int argc, char *argv[])
                        ctr[TR_CANCEL], NULL);
        } else {
            rc = 1;
-           fstype = REISERFS;
+           fstype = EXT3;
        }
        if (rc == 2)
                goto EXIT;
@@ -350,6 +377,9 @@ int main(int argc, char *argv[])
        } else if (fstype == EXT3) {
                mysystem("/sbin/modprobe ext3");
                sprintf(mkfscommand, "/sbin/mke2fs -T ext3");
+       } else if (fstype == EXT4) {
+               mysystem("/sbin/modprobe ext4");
+               sprintf(mkfscommand, "/sbin/mke2fs -T ext4");
        }
 
        snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -I 128 %s1", hdparams.devnode_part);
@@ -462,7 +492,9 @@ int main(int argc, char *argv[])
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
        } else if (fstype == EXT3) {
                replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
-               NOJOURNAL:
+               replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
+       } else if (fstype == EXT4) {
+               replace("/harddisk/etc/fstab", "FSTYPE", "ext4");
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
        }