Merge commit 'origin/master' into next

[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 8f3642e170e9e1e0f8072be9c2d4575a8f34ad19..dc3ac1934029f7be773e966de70af2eedba719e5 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -35,6 +35,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 };
@@ -57,7 +60,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,31 +111,20 @@ int main(int argc, char *argv[])
                }               
        }
 
-       // Load ata-piix prior kudzu because kudzu use ata-generic for ich7
-//     mysystem("/sbin/modprobe ata_piix");
-
-       // Starting hardware detection
-//     runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ...");
+       // 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 ide-generic");
-//     mysystem("/sbin/modprobe ide-cd");
-//     mysystem("/sbin/modprobe ide-disk");
-//     mysystem("/sbin/modprobe ehci-hcd");
-//     mysystem("/sbin/modprobe uhci-hcd");
-//     mysystem("/sbin/modprobe ohci-hcd");
-//     mysystem("/sbin/modprobe ohci1394");
-//     mysystem("/sbin/modprobe sd_mod");
-//     mysystem("/sbin/modprobe sr_mod");
-//     mysystem("/sbin/modprobe usb-storage");
-//     mysystem("/sbin/modprobe usbhid");
-//     mysystem("/sbin/modprobe ahci");
-
        mysystem("/sbin/modprobe iso9660"); // CDROM
        mysystem("/sbin/modprobe ext2"); // Boot patition
        mysystem("/sbin/modprobe vfat"); // USB key
-
-       runcommandwithstatus("/bin/sleep 10", "Waiting for USB Hardware ...");
        
        /* German is the default */
        for (choice = 0; langnames[choice]; choice++)
@@ -156,6 +148,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;
@@ -448,17 +447,6 @@ int main(int argc, char *argv[])
        /* Save language und local settings */
        write_lang_configs(shortlangname);
 
-//     /* touch the modules.dep files */
-//     snprintf(commandstring, STRING_SIZE, 
-//             "/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep",
-//             KERNEL_VERSION);
-//     mysystem(commandstring);
-/*     snprintf(commandstring, STRING_SIZE, 
-               "/bin/touch /harddisk/lib/modules/%s-ipfire-smp/modules.dep",
-               KERNEL_VERSION);
-       mysystem(commandstring);
-*/
-
        /* Rename uname */
        rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
 
@@ -493,20 +481,6 @@ int main(int argc, char *argv[])
                replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
        } else if (fstype == EXT3) {
-               //snprintf(commandstring, STRING_SIZE, "tune2fs -j %s3", hdparams.devnode_part);
-               //if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
-               //{
-               //      errorbox(ctr[TR_JOURNAL_ERROR]);
-               //      replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
-               //      goto NOJOURNAL;
-               //}
-               //snprintf(commandstring, STRING_SIZE, "tune2fs -j %s4", hdparams.devnode_part);
-               //if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
-               //{
-               //      errorbox(ctr[TR_JOURNAL_ERROR]);
-               //      replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
-               //      goto NOJOURNAL;
-               //}
                replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
                NOJOURNAL:
                replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
@@ -514,10 +488,6 @@ int main(int argc, char *argv[])
 
        replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
 
-       /* Going to make our initrd... */
-/*     snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/local/bin/rebuild-initrd");
-       runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-*/
        snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#root=ROOT#root=UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/boot/grub/grub.conf", hdparams.devnode_part);
        system(commandstring);