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=a46de921f70bebbe9aafd46712c3c97f5a42d578;hp=57cfd5a5efff84a48305ed74849b787ab5a209d1;hb=927eb20ae3c6ecaa0a5795335263f636fd549382;hpb=841323bc3ecd3ebf3a0c129a8ffd8d407d5c8cdf diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 57cfd5a5ef..a46de921f7 100644 --- 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 */ @@ -107,31 +108,10 @@ 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 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++) @@ -230,11 +210,6 @@ int main(int argc, char *argv[]) sprintf(hdparams.devnode_part, "/dev/%s%s", harddrive,raid_disk ? "p" : ""); /* Now the names after the machine is booted. Only scsi is affected and we only install on the first scsi disk. */ - { char tmp[30]; - strcpy(tmp, scsi_disk ? "sda" : harddrive); - sprintf(hdparams.devnode_disk_run, "/dev/%s", tmp); - sprintf(hdparams.devnode_part_run, "/dev/%s%s", tmp, raid_disk ? "p" : ""); - } fprintf(flog, "Destination drive: %s\n", hdparams.devnode_disk); @@ -287,7 +262,7 @@ int main(int argc, char *argv[]) * the disk. */ /* Don't use mysystem here so we can redirect output */ - sprintf(commandstring, "/bin/sfdisk -s /dev/%s > /tmp/disksize 2> /dev/null", harddrive); + sprintf(commandstring, "/sbin/sfdisk -s /dev/%s > /tmp/disksize 2> /dev/null", harddrive); system(commandstring); /* Calculate amount of disk space */ @@ -359,7 +334,7 @@ int main(int argc, char *argv[]) fclose(handle); - snprintf(commandstring, STRING_SIZE, "/bin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk); + snprintf(commandstring, STRING_SIZE, "/sbin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk); if (runcommandwithstatus(commandstring, ctr[TR_PARTITIONING_DISK])) { errorbox(ctr[TR_UNABLE_TO_PARTITION]); @@ -368,16 +343,16 @@ int main(int argc, char *argv[]) if (fstype == EXT2) { mysystem("/sbin/modprobe ext2"); - sprintf(mkfscommand, "/sbin/mke2fs -T ext2 -c"); + sprintf(mkfscommand, "/sbin/mke2fs -T ext2"); } else if (fstype == REISERFS) { mysystem("/sbin/modprobe reiserfs"); sprintf(mkfscommand, "/sbin/mkreiserfs -f"); } else if (fstype == EXT3) { mysystem("/sbin/modprobe ext3"); - sprintf(mkfscommand, "/sbin/mke2fs -T ext3 -c"); + sprintf(mkfscommand, "/sbin/mke2fs -T ext3"); } - snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -c %s1", hdparams.devnode_part); + snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -I 128 %s1", hdparams.devnode_part); if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM])) { errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]); @@ -440,7 +415,7 @@ int main(int argc, char *argv[]) } snprintf(commandstring, STRING_SIZE, - "/bin/tar -C /harddisk -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma"); + "/bin/tar -C /harddisk -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma 2>/dev/null"); if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT, ctr[TR_INSTALLING_FILES])) @@ -452,17 +427,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"); @@ -473,7 +437,7 @@ int main(int argc, char *argv[]) mysystem("/bin/mount --bind /sys /harddisk/sys"); /* Build cache lang file */ - snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\""); + snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\""); if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_LANG_CACHE])) { errorbox(ctr[TR_UNABLE_TO_INSTALL_LANG_CACHE]); @@ -481,8 +445,15 @@ int main(int argc, char *argv[]) } /* Update /etc/fstab */ - replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run); - + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE1#UUID=$(/sbin/blkid %s1 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE2#UUID=$(/sbin/blkid %s2 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE3#UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE4#UUID=$(/sbin/blkid %s4 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part); + system(commandstring); + if (fstype == EXT2) { replace("/harddisk/etc/fstab", "FSTYPE", "ext2"); replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro"); @@ -490,20 +461,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"); @@ -511,40 +468,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 ); - 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); - 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("/bin/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); + "/usr/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk); if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) { errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]); goto EXIT; @@ -559,7 +491,7 @@ int main(int argc, char *argv[]) } mysystem("umount /cdrom"); - snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive); + snprintf(commandstring, STRING_SIZE, "/usr/bin/eject /dev/%s", sourcedrive); mysystem(commandstring); if (!unattended) { @@ -595,10 +527,10 @@ EXIT: fclose(flog); newtFinished(); - if (!unattended) { - if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL")) - printf("Unable to run setup.\n"); - } +// if (!unattended) { +// if (system("/usr/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL")) +// printf("Unable to run setup.\n"); +// } if (system("/bin/umount /harddisk/proc")) printf("Unable to umount /harddisk/proc.\n"); @@ -623,8 +555,9 @@ EXIT: system("/bin/umount /harddisk/var"); system("/bin/umount /harddisk/boot"); system("/bin/umount /harddisk"); - - system("/etc/halt"); + + if (!(allok)) + system("/etc/halt"); return 0; }