X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=76d37c2e487d2c03101bb09911380552508f4a50;hb=dbf157bbaa613a356b3ca5f6d294147f1daded2e;hp=852819b176bd606878d061896114a1705a0adcc4;hpb=ceba6fdfeb34fb63dfdc916106f225a595584882;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 852819b17..76d37c2e4 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -30,12 +30,13 @@ struct knic knics[20] = { { "" , "" , "" , "" } }; // only defined for compile extern char *en_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", NULL }; + char *shortlangnames[] = { "de", "en", "fr" ,NULL }; + char **langtrs[] = { de_tr, en_tr, fr_tr,NULL }; char hdletter; char harddrive[30], sourcedrive[5]; /* Device holder. */ struct devparams hdparams, cdromparams; /* Params for CDROM and HD */ @@ -43,7 +44,7 @@ int main(int argc, char *argv[]) char commandstring[STRING_SIZE]; char mkfscommand[STRING_SIZE]; char *fstypes[] = { "Reiser4", "ReiserFS", "ext3", NULL }; - int fstype = REISER4; + int fstype = REISERFS; int choice; int i; int found = 0; @@ -66,6 +67,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 +91,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,13 +107,19 @@ 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"); 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"); @@ -119,6 +129,8 @@ int main(int argc, char *argv[]) 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 +149,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 +215,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. @@ -256,7 +264,7 @@ int main(int argc, char *argv[]) ctr[TR_CANCEL], NULL); } else { rc = 1; - fstype = REISER4; // Reiser4 is our standard filesystem. Love it or shut up! + fstype = REISERFS; } if (rc == 2) goto EXIT; @@ -431,7 +439,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])) @@ -448,10 +456,11 @@ int main(int argc, char *argv[]) "/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep", KERNEL_VERSION); mysystem(commandstring); - snprintf(commandstring, STRING_SIZE, +/* 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"); @@ -475,7 +484,6 @@ int main(int argc, char *argv[]) if (fstype == REISER4) { replace("/harddisk/etc/fstab", "FSTYPE", "reiser4"); - replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"reiser4 "); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "rw"); } else if (fstype == REISERFS) { replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs"); @@ -497,12 +505,20 @@ int main(int argc, char *argv[]) } replace("/harddisk/etc/fstab", "FSTYPE", "ext3"); NOJOURNAL: - replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"ext3 "); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); } 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 */ @@ -515,8 +531,10 @@ int main(int argc, char *argv[]) /* 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 /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); @@ -531,6 +549,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);