Merge remote branch 'origin/master' into dracut

[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 c16bde8f707a03bf7b7f8382855936bb49bcc25e..2de12bd41497b8bd4b404556cd6ff89b1575ec33 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -11,7 +11,7 @@
 #include "install.h"
 #define _GNU_SOURCE
  
-#define INST_FILECOUNT 6200
+#define INST_FILECOUNT 8400
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 #define EXT2 0
@@ -29,14 +29,15 @@ struct  nic  nics[20] = { { "" , "" , "" } }; // only defined for compile
 struct knic knics[20] = { { "" , "" , "" , "" } }; // only defined for compile
 
 extern char *en_tr[];
+extern char *es_tr[];
 extern char *de_tr[];
 extern char *fr_tr[];
 
 int main(int argc, char *argv[])
 {
-       char *langnames[] = { "Deutsch", "English", "Français", NULL };
-       char *shortlangnames[] = { "de", "en", "fr" ,NULL };
-       char **langtrs[] = { de_tr, en_tr, fr_tr,NULL };
+       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 };
        char hdletter;
        char harddrive[30], sourcedrive[5];     /* Device holder. */
        struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
@@ -302,9 +303,9 @@ int main(int argc, char *argv[])
        fprintf(flog, "Disksize = %ld, memory = %ld", disk, memory);
        
         /* Calculating Swap-Size dependend of Ram Size */
-       if (memory < 128)
-               swap_file = 32;
-       else if (memory > 512)
+       if (memory <= 256)
+               swap_file = 128;
+       else if (memory <= 1024 && memory > 256)
                swap_file = 256;
        else 
                swap_file = memory / 4;
@@ -511,37 +512,15 @@ int main(int argc, char *argv[])
 
        replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
 
-       /* Build the emergency ramdisk with all drivers */
-       mysystem("cp -f /harddisk/etc/mkinitcpio.conf /harddisk/etc/mkinitcpio.conf.org");
-
-       replace("/harddisk/etc/mkinitcpio.conf", " autodetect ", " ");
-       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-emergency.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);
-       runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-
-       mysystem("cp -f /harddisk/etc/mkinitcpio.conf.org /harddisk/etc/mkinitcpio.conf");
-
-       /* mkinitcpio has a problem if ide and pata are included */
-       if ( scsi_disk==1 ) {
-           /* Remove the ide hook if we install sda */
-           replace("/harddisk/etc/mkinitcpio.conf", " ide ", " ");
-       } else {
-           /* Remove the pata & sata hook if we install hda */
-           replace("/harddisk/etc/mkinitcpio.conf", " pata ", " ");
-           replace("/harddisk/etc/mkinitcpio.conf", " sata ", " ");
-       }
        /* Going to make our initrd... */
-       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);
-       runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-/*     snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION );
+       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/local/bin/rebuild-initrd");
        runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-*/
-
 
        sprintf(string, "root=%s3", hdparams.devnode_part_run);
        replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
        mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
 
-       system("sed -e 's#harddisk\\/##g' < /proc/mounts > /harddisk/etc/mtab");
+       system("sed -e 's#/harddisk#/#g' -e 's#//#/#g'  < /proc/mounts > /harddisk/etc/mtab");
 
        snprintf(commandstring, STRING_SIZE, 
                 "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);