#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;
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;
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");
}
}
+ // 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");
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++)
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);
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 )
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");
}
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]))
KERNEL_VERSION);
mysystem(commandstring);
*/
- snprintf(commandstring, STRING_SIZE,
- "/bin/touch /harddisk/lib/modules/2.6.25.17-ipfire/modules.dep");
- mysystem(commandstring);
-
/* Rename uname */
rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
/* 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");
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);
+ snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/local/bin/rebuild-initrd");
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, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-2.6.25.17.img -k 2.6.25.17-ipfire");
- 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);
/* Copy restore file from cdrom */
if (unattended && (strlen(restore_file) > 0)) {
fprintf(flog, "unattended: Copy restore file\n");
- snprintf(commandstring, STRING_SIZE,
+ snprintf(commandstring, STRING_SIZE,
"cp /cdrom/%s /harddisk/var/ipfire/backup", restore_file);
+ mysystem(commandstring);
}
mysystem("umount /cdrom");
projects / people / pmueller / ipfire-2.x.git / blobdiff