#define CDROM_INSTALL 0
#define URL_INSTALL 1
#define DISK_INSTALL 2
-#define INST_FILECOUNT 7000
+#define INST_FILECOUNT 6200
#define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
-int raid_disk = 0;
+#define REISER4 0
+#define REISERFS 1
+#define EXT3 2
+
FILE *flog = NULL;
char *mylog;
return memory*2;
}
+long calc_rootsize(long free, long max) {
+ long root;
+
+ root = max / 2;
+ if (root < 256) {
+ return 0;
+ }
+ if (root > 2048) {
+ root = 2048;
+ }
+ return root;
+}
+
int main(int argc, char *argv[])
{
char *langnames[] = { "Deutsch", "English", NULL };
char *shortlangnames[] = { "de", "en", NULL };
char **langtrs[] = { de_tr, en_tr, NULL };
char hdletter;
- char harddrive[5], sourcedrive[5]; /* Device holder. */
+ char harddrive[11], sourcedrive[5]; /* Device holder. */
struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
int cdmounted = 0; /* Loop flag for inserting a cd. */
int rc = 0;
char commandstring[STRING_SIZE];
char *installtypes[] = { "CDROM/USB", "HTTP/FTP", NULL };
int installtype = CDROM_INSTALL;
+ char mkfscommand[STRING_SIZE];
+ char *fstypes[] = { "Reiser4", "ReiserFS", "ext3", NULL };
+ int fstype = REISER4;
int choice;
int i;
int found = 0;
char title[STRING_SIZE];
int allok = 0;
int allok_fastexit=0;
+ int raid_disk = 0;
struct keyvalue *ethernetkv = initkeyvalues();
FILE *handle, *cmdfile;
char line[STRING_SIZE];
if (strstr (line, "unattended") != NULL) {
unattended = 1;
}
- // Loading the cdrom-filesystem
+ // Loading the cdrom-filesystem and ext2
mysystem("/sbin/modprobe iso9660");
+ mysystem("/sbin/modprobe ext2");
+
+ // Loading the via_rhine driver because it isn't detected correctly (sometimes)
+ mysystem("/sbin/modprobe via-rhine");
}
if (unattended) {
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);
}
// 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")) {
case 0:
- installtype = CDROM_INSTALL;
- cdmounted = 1;
+ installtype = CDROM_INSTALL;
+ cdmounted = 1;
break;
case 1:
- installtype = DISK_INSTALL;
+ installtype = DISK_INSTALL;
break;
case 10:
- errorbox(ctr[TR_NO_CDROM]);
+ errorbox(ctr[TR_NO_CDROM]);
goto EXIT;
}
switch (mysystem("/bin/mountdest.sh") % 255) {
case 0: // Found IDE disk
scsi_disk = 0;
+ raid_disk = 0;
found = 1;
break;
case 1: // Found SCSI disk
scsi_disk = 1;
+ raid_disk = 0;
+ found = 1;
+ break;
+ case 2: // Found RAID disk
+ scsi_disk = 0;
+ raid_disk= 1;
found = 1;
break;
case 10: // No harddisk found
}
}
- /*
- // Need to clean this up at some point
- // scsi disk is sdb/sdc when sda/sdb is used for usb-key
- // if scsi-disk is sdd or more, it is not discovered
- // Support only 2 usb keys, none could be unplugged
- if (checkusb("sdb") && try_scsi("sdc")) {
- scsi_disk = 1;
- sprintf(harddrive, "sdc");
- goto FOUND_DESTINATION;
- }
- if (checkusb("sda") && try_scsi("sdb")) {
- scsi_disk = 1;
- sprintf(harddrive, "sdb");
- goto FOUND_DESTINATION;
- }
- if (try_scsi("sda")) {
- scsi_disk = 1;
- sprintf(harddrive, "sda");
- goto FOUND_DESTINATION;
- }
- if (try_scsi("ida/c0d0")) {
- raid_disk = 1;
- sprintf(harddrive, "ida/c0d0");
- goto FOUND_DESTINATION;
- }
- if (try_scsi("cciss/c0d0")) {
- raid_disk = 1;
- sprintf(harddrive, "cciss/c0d0");
- goto FOUND_DESTINATION;
- }
- if (try_scsi("rd/c0d0")) {
- raid_disk = 1;
- sprintf(harddrive, "rd/c0d0");
- goto FOUND_DESTINATION;
- }
- if (try_scsi("ataraid/d0")) {
- raid_disk = 1;
- sprintf(harddrive, "ataraid/d0");
- goto FOUND_DESTINATION;
- } */
-
- FOUND_DESTINATION:
if ((handle = fopen("/tmp/dest_device", "r")) == NULL) {
errorbox(ctr[TR_NO_HARDDISK]);
goto EXIT;
}
- fgets(harddrive, 5, handle);
+ fgets(harddrive, 11, handle);
fclose(handle);
/* load unattended configuration */
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,
if (rc == 2)
goto EXIT;
+ if (!unattended) {
+ sprintf(message, "(TR) Bitte waehlen Sie ihr Dateisystem aus:");
+ rc = newtWinMenu("(TR) Dateisystemauswahl", message,
+ 50, 5, 5, 6, fstypes, &fstype, ctr[TR_OK],
+ ctr[TR_CANCEL], NULL);
+ } else {
+ rc = 1;
+ fstype = REISER4; // Reiser4 is our standard filesystem. Love it or shut up!
+ }
+ if (rc == 2)
+ goto EXIT;
+
/* Calculate amount of memory in machine */
if ((handle = fopen("/proc/meminfo", "r")))
{
system(commandstring);
/* Calculate amount of disk space */
- if ((handle = fopen("/tmp/disksize", "r")))
- {
- fgets(line, STRING_SIZE-1, handle);
- if (sscanf (line, "%s", string)) {
+ if ((handle = fopen("/tmp/disksize", "r"))) {
+ fgets(line, STRING_SIZE-1, handle);
+ if (sscanf (line, "%s", string)) {
maximum_free = atoi(string) / 1024;
- }
- fclose(handle);
- }
+ }
+ fclose(handle);
+ }
- fprintf(flog, "maximum_free = %ld, memory = %ld",
- maximum_free, memory);
+ fprintf(flog, "maximum_free = %ld, memory = %ld", maximum_free, memory);
swap_file = calc_swapsize(memory, maximum_free);
if (maximum_free < 512 + swap_file ) {
- if (maximum_free < 512) {
+ if (maximum_free < 700) {
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 {
+ } else {
rc = 1;
}
boot_partition = 20; /* in MB */
current_free = maximum_free - boot_partition - swap_file;
- root_partition = 1024 ;
- if (current_free < 512) {
+ if (current_free < 700) {
errorbox(ctr[TR_DISK_TOO_SMALL]);
goto EXIT;
}
-
- current_free = current_free - root_partition;
- if (!swap_file) {
- root_partition = root_partition + swap_file;
+
+ root_partition = calc_rootsize(current_free, maximum_free);
+
+ if (root_partition == 0) {
+ errorbox(ctr[TR_DISK_TOO_SMALL]);
+ goto EXIT;
+ } else {
+ current_free = current_free - root_partition;
+ }
+
+ if (current_free < 256) {
+ errorbox(ctr[TR_DISK_TOO_SMALL]);
+ goto EXIT;
}
system_partition = current_free;
errorbox(ctr[TR_UNABLE_TO_PARTITION]);
goto EXIT;
}
-
- mysystem("/sbin/udevstart");
-
- snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
+
+ if (fstype == REISER4) {
+ mysystem("/sbin/modprobe reiser4");
+ sprintf(mkfscommand, "/sbin/mkfs.reiser4 -y");
+ } 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");
+ }
+
+ 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]);
}
}
- snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s3", hdparams.devnode_part);
+ snprintf(commandstring, STRING_SIZE, "%s %s3", mkfscommand, hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_ROOT_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
goto EXIT;
}
- snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s4", hdparams.devnode_part);
+ snprintf(commandstring, STRING_SIZE, "%s %s4", mkfscommand, hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
{
- errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
+ errorbox(ctr[TR_UNABLE_TO_MAKE_LOG_FILESYSTEM]);
goto EXIT;
}
- /* Mount harddisk. */
- mysystem("/sbin/modprobe reiserfs"); // to be banished...
-
snprintf(commandstring, STRING_SIZE, "/bin/mount %s3 /harddisk", hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_ROOT_FILESYSTEM]))
{
/* Update /etc/fstab */
replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run);
+
+ 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");
+ 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, "(TR) Creating journal for ext3..."))
+ {
+ errorbox("(TR) Unable to create journal. Going back to ext2.");
+ replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
+ goto NOJOURNAL;
+ }
+ snprintf(commandstring, STRING_SIZE, "tune2fs -j %s4", hdparams.devnode_part);
+ if (runcommandwithstatus(commandstring, "(TR) Creating journal for ext3..."))
+ {
+ errorbox("(TR) Unable to create journal. Going back to ext2.");
+ 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);
goto EXIT;
}
- /* Install bootsplash */
- // mysystem("/bin/installbootsplash.sh"); We cannot use this at the moment, it conflicts with our initrds...
-
mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
+
+ mysystem("umount /cdrom");
+ snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive);
+ mysystem(commandstring);
if (!unattended) {
sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
NAME, SNAME, NAME);
newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
}
-
+
allok = 1;
EXIT:
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"))