X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=9cf1bd5e3776223ea0df5d2dcfa79f35819b2b38;hp=ffe833abbb528b293f63472b79063ec7acf05107;hb=3e1bab93c1ab3eb6227001553640e0412c4d55eb;hpb=6abfa9889f7acf651e091897ea5e4db83c055a2b diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index ffe833abbb..9cf1bd5e37 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -11,12 +11,12 @@ #include "install.h" #define _GNU_SOURCE -#define INST_FILECOUNT 6200 +#define INST_FILECOUNT 8400 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf" -#define REISER4 0 -#define REISERFS 1 -#define EXT3 2 +#define EXT2 0 +#define REISERFS 2 +#define EXT3 1 FILE *flog = NULL; char *mylog; @@ -29,20 +29,22 @@ 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", NULL }; - char *shortlangnames[] = { "de", "en", NULL }; - char **langtrs[] = { de_tr, en_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 */ int rc = 0; char commandstring[STRING_SIZE]; char mkfscommand[STRING_SIZE]; - char *fstypes[] = { "Reiser4", "ReiserFS", "ext3", NULL }; + char *fstypes[] = { "ext2", "ext3", "ReiserFS", NULL }; int fstype = REISERFS; int choice; int i; @@ -66,6 +68,7 @@ int main(int argc, char *argv[]) int unattended = 0; struct keyvalue *unattendedkv = initkeyvalues(); int hardyn = 0; + char restore_file[STRING_SIZE] = ""; setlocale (LC_ALL, ""); sethostname( SNAME , 10); @@ -89,7 +92,9 @@ int main(int argc, char *argv[]) newtInit(); newtCls(); - /* Do usb detection first for usb keyboard */ + newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN ); + sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN); + if (! (cmdfile = fopen("/proc/cmdline", "r"))) { fprintf(flog, "Couldn't open commandline: /proc/cmdline\n"); @@ -103,22 +108,31 @@ 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 ..."); + + // Load common modules mysystem("/sbin/modprobe ide-generic"); -// mysystem("/sbin/modprobe generic"); - mysystem("/sbin/modprobe ide-cd_mod"); + 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 ehci-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++) @@ -137,12 +151,7 @@ int main(int argc, char *argv[]) ctr = langtrs[choice]; strcpy(shortlangname, shortlangnames[choice]); - newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN ); newtPushHelpLine(ctr[TR_HELPLINE]); - sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN); - - // Starting hardware detection - runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]); sprintf(message, ctr[TR_WELCOME], NAME); newtWinMessage(title, ctr[TR_OK], message); @@ -208,6 +217,7 @@ int main(int argc, char *argv[]) fprintf(flog, "unattended: Reading unattended.conf\n"); (void) readkeyvalues(unattendedkv, UNATTENDED_CONF); + findkey(unattendedkv, "RESTORE_FILE", restore_file); } /* Make the hdparms struct and print the contents. @@ -293,12 +303,12 @@ 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 >= 1024) - swap_file = 512; + if (memory <= 256) + swap_file = 128; + else if (memory <= 1024 && memory > 256) + swap_file = 256; else - swap_file = memory; + swap_file = memory / 4; /* Calculating Root-Size dependend of Max Disk Space */ if ( disk < 756 ) @@ -357,9 +367,9 @@ int main(int argc, char *argv[]) goto EXIT; } - if (fstype == REISER4) { - mysystem("/sbin/modprobe reiser4"); - sprintf(mkfscommand, "/sbin/mkfs.reiser4 -y"); + if (fstype == EXT2) { + mysystem("/sbin/modprobe ext2"); + sprintf(mkfscommand, "/sbin/mke2fs -T ext2 -c"); } else if (fstype == REISERFS) { mysystem("/sbin/modprobe reiserfs"); sprintf(mkfscommand, "/sbin/mkreiserfs -f"); @@ -431,7 +441,7 @@ int main(int argc, char *argv[]) } snprintf(commandstring, STRING_SIZE, - "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2"); + "/bin/tar -C /harddisk -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma"); if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT, ctr[TR_INSTALLING_FILES])) @@ -453,6 +463,7 @@ int main(int argc, char *argv[]) KERNEL_VERSION); mysystem(commandstring); */ + /* Rename uname */ rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname"); @@ -473,9 +484,9 @@ int main(int argc, char *argv[]) /* Update /etc/fstab */ replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run); - if (fstype == REISER4) { - replace("/harddisk/etc/fstab", "FSTYPE", "reiser4"); - replace("/harddisk/boot/grub/grub.conf", "MOUNT", "rw"); + if (fstype == EXT2) { + replace("/harddisk/etc/fstab", "FSTYPE", "ext2"); + replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); } else if (fstype == REISERFS) { replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs"); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); @@ -525,11 +536,13 @@ int main(int argc, char *argv[]) /* snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION ); 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); @@ -538,6 +551,14 @@ int main(int argc, char *argv[]) goto EXIT; } + /* Copy restore file from cdrom */ + if (unattended && (strlen(restore_file) > 0)) { + fprintf(flog, "unattended: Copy restore file\n"); + snprintf(commandstring, STRING_SIZE, + "cp /cdrom/%s /harddisk/var/ipfire/backup", restore_file); + mysystem(commandstring); + } + mysystem("umount /cdrom"); snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive); mysystem(commandstring);