#define CDROM_INSTALL 0
#define URL_INSTALL 1
#define DISK_INSTALL 2
-#define INST_FILECOUNT 6000
+#define INST_FILECOUNT 6200
#define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
#define REISER4 0
return (cpu_count > 1);
}
-long calc_swapsize(long memory, long disk) {
- if (memory < 128) {
- return 256;
- }
- if (memory > 1024) {
- return 512;
- }
-
- return memory*2;
-}
-
-long calc_rootsize(long free, long max) {
- long root;
-
- root = max / 2;
- if (root < 512) {
- return 0;
- }
- if (root > 2048) {
- root = 2048;
- }
- return root;
-}
-
int main(int argc, char *argv[])
{
char *langnames[] = { "Deutsch", "English", NULL };
FILE *handle, *cmdfile;
char line[STRING_SIZE];
char string[STRING_SIZE];
- long maximum_free = 0, current_free;
- long memory = 0;
+ long memory = 0, disk = 0, free;
long system_partition, boot_partition, root_partition, swap_file;
int scsi_disk = 0;
char *yesnoharddisk[3]; // char *yesnoharddisk = { "NO", "YES", NULL };
fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
} else {
fgets(line, STRING_SIZE, cmdfile);
- if (strstr (line, "noide") == NULL) {
- fprintf(flog, "Initializing IDE controllers.\n");
- initialize_ide();
- } else {
- fprintf(flog, "Skipping IDE detection.\n");
- }
- if (strstr (line, "nousb") == NULL) {
- fprintf(flog, "Initializing USB controllers.\n");
- initialize_usb();
- } else {
- fprintf(flog, "Skipping USB detection.\n");
- }
+
// check if we have to make an unattended install
if (strstr (line, "unattended") != NULL) {
unattended = 1;
- }
- // Loading the cdrom-filesystem
- mysystem("/sbin/modprobe iso9660");
- }
-
- if (unattended) {
- runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
- }
+ runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
+ }
+ }
+
+ mysystem("/sbin/modprobe ide-generic");
+ mysystem("/sbin/modprobe generic");
+ mysystem("/sbin/modprobe ide-cd");
+ mysystem("/sbin/modprobe ide-disk");
+ 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 iso9660"); // CDROM
+ mysystem("/sbin/modprobe ext2"); // Boot patition
+ mysystem("/sbin/modprobe vfat"); // USB key
/* German is the default */
for (choice = 0; langnames[choice]; choice++)
goto EXIT;
if (!unattended) {
- rc = newtWinMenu("Language selection",
- "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
+ rc = newtWinMenu("Language selection", "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
langnames, &choice, "Ok", NULL);
}
ctr = langtrs[choice];
strcpy(shortlangname, shortlangnames[choice]);
- fprintf(flog, "Selected language: %s\n", shortlangname);
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]);
+
if (!unattended) {
sprintf(message, ctr[TR_WELCOME], NAME);
newtWinMessage(title, ctr[TR_OK], message);
if (rc == 2)
goto EXIT;
- // Starting hardware detection
- runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
- runcommandwithstatus("/bin/probenic.sh install", ctr[TR_PROBING_HARDWARE]);
-
/* CDROM INSTALL */
if (installtype == CDROM_INSTALL) {
switch (mysystem("/bin/mountsource.sh")) {
sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode_disk);
if (unattended) {
hardyn = 1;
+ } else {
+ yesnoharddisk[0] = ctr[TR_NO];
+ yesnoharddisk[1] = ctr[TR_YES];
+ yesnoharddisk[2] = NULL;
}
- yesnoharddisk[0] = ctr[TR_NO];
- yesnoharddisk[1] = ctr[TR_YES];
- yesnoharddisk[2] = NULL;
-
while (! hardyn) {
rc = newtWinMenu(title, message,
50, 5, 5, 6, yesnoharddisk,
goto EXIT;
if (!unattended) {
- sprintf(message, "(TR) Bitte waehlen Sie ihr Dateisystem aus:");
- rc = newtWinMenu("(TR) Dateisystemauswahl", message,
+ sprintf(message, ctr[TR_CHOOSE_FILESYSTEM]);
+ rc = newtWinMenu( ctr[TR_CHOOSE_FILESYSTEM], message,
50, 5, 5, 6, fstypes, &fstype, ctr[TR_OK],
ctr[TR_CANCEL], NULL);
} else {
if ((handle = fopen("/tmp/disksize", "r"))) {
fgets(line, STRING_SIZE-1, handle);
if (sscanf (line, "%s", string)) {
- maximum_free = atoi(string) / 1024;
+ disk = atoi(string) / 1024;
}
fclose(handle);
}
- fprintf(flog, "maximum_free = %ld, memory = %ld", maximum_free, memory);
+ fprintf(flog, "Disksize = %ld, memory = %ld", disk, memory);
- swap_file = calc_swapsize(memory, maximum_free);
-
- if (maximum_free < 768 + swap_file ) {
- if (maximum_free < 768) {
- errorbox(ctr[TR_DISK_TOO_SMALL]);
- goto EXIT;
- }
-
- if (!unattended) {
- rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
- }
- else {
- rc = 1;
- }
-
- if (rc != 1)
- goto EXIT;
- swap_file = 0;
- }
-
- boot_partition = 20; /* in MB */
- current_free = maximum_free - boot_partition - swap_file;
-
- if (current_free < 768) {
- errorbox(ctr[TR_DISK_TOO_SMALL]);
- goto EXIT;
- }
+ /* Calculating Swap-Size dependend of Ram Size */
+ if (memory < 128)
+ swap_file = 32;
+ else if (memory >= 1024)
+ swap_file = 512;
+ else
+ swap_file = memory;
- root_partition = calc_rootsize(current_free, maximum_free);
+ /* Calculating Root-Size dependend of Max Disk Space */
+ if ( disk < 756 )
+ root_partition = 256;
+ else if ( disk >= 1024 && disk <= 3072 )
+ root_partition = 512;
+ else
+ root_partition = 2048;
+
- if (root_partition == 0) {
- errorbox(ctr[TR_DISK_TOO_SMALL]);
- goto EXIT;
- } else {
- current_free = current_free - root_partition;
- }
+ /* Calculating the amount of free space */
+ boot_partition = 20; /* in MB */
+ system_partition = disk - ( root_partition + swap_file + boot_partition );
- if (current_free < 256) {
- errorbox(ctr[TR_DISK_TOO_SMALL]);
- goto EXIT;
- }
-
- system_partition = current_free;
-
- fprintf(flog, "boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
- boot_partition, swap_file, system_partition, root_partition);
-
+ fprintf(flog, ", boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
+ boot_partition, swap_file, system_partition, root_partition);
+
+ if ( (!unattended) && (((disk - (root_partition + swap_file + boot_partition)) < 256 ) && ((disk - (root_partition + boot_partition + 32 )) > 256)) ) {
+ rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
+ if (rc != 0){
+ swap_file = 32;
+ system_partition = disk - ( root_partition + swap_file + boot_partition );
+ fprintf(flog, "Changing Swap Size to 32 MB.\n");
+ }
+ else {
+ fprintf(flog, "Disk is too small.\n");
+ errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT;
+ }
+ }
+ else if (disk - (root_partition + swap_file + boot_partition) >= 256) {
+
+ }
+ else {
+ fprintf(flog, "Disk is too small.\n");
+ errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT;
+ }
+
handle = fopen("/tmp/partitiontable", "w");
/* Make swapfile */
sprintf(mkfscommand, "/sbin/mkreiserfs -f");
} else if (fstype == EXT3) {
mysystem("/sbin/modprobe ext3");
- sprintf(mkfscommand, "/bin/mke2fs -T ext3 -c");
+ sprintf(mkfscommand, "/sbin/mke2fs -T ext3 -c");
}
- snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
+ snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]);
errorbox(ctr[TR_UNABLE_TO_INSTALL_FILES]);
goto EXIT;
}
-
- /* Save USB controller type to modules.conf */
- write_usb_modules_conf();
/* Save language und local settings */
write_lang_configs(shortlangname);
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/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"ext3 ");
replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
}
/* Going to make our initrd... */
- snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -v -g /boot/ipfirerd.img -k %s-ipfire", KERNEL_VERSION);
+ snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd.img -k %s-ipfire", KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
- snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -v -g /boot/ipfirerd-smp.img -k %s-ipfire-smp", KERNEL_VERSION);
+ snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-smp.img -k %s-ipfire-smp", KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
sprintf(string, "root=%s3", hdparams.devnode_part_run);
mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
mysystem("umount /cdrom");
- ejectcdrom(sourcedrive);
+ snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive);
+ mysystem(commandstring);
if (!unattended) {
sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
newtFinished();
if (!unattended) {
- // Copy our scanned nics to the disk and lock because scan doesn't work in chroot
- system("touch /harddisk/var/ipfire/ethernet/scan_lock");
- system("cp -f /tmp/scanned_nics /harddisk/var/ipfire/ethernet/scanned_nics");
if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
printf("Unable to run setup.\n");
- system("rm -f /harddisk/var/ipfire/ethernet/scan_lock");
}
if (system("/bin/umount /harddisk/proc"))
projects / people / pmueller / ipfire-2.x.git / blobdiff