]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - src/install+setup/install/main.c
Kudzu, ReiserFS, uClibc, gettext und Arbeit am Installer
[people/teissler/ipfire-2.x.git] / src / install+setup / install / main.c
index dcf47926c25c569445332ce100713d416e398ee3..371530da81369cabce1fef91184e644cd626f57c 100644 (file)
@@ -6,14 +6,16 @@
  * (c) Lawrence Manning, 2001
  * Contains main entry point, and misc functions.
  * 
- * $Id: main.c,v 1.63.2.57 2005/09/25 19:57:46 gespinasse Exp $
- * 
  */
 
 #include "install.h"
-
+#define _GNU_SOURCE
 #define CDROM_INSTALL 0
 #define URL_INSTALL 1
+#define DISK_INSTALL 2
+#define INST_FILECOUNT 6600
+#define UNATTENDED_CONF "/cdrom/data/unattended.conf"
 
 int raid_disk = 0;
 FILE *flog = NULL;
@@ -24,50 +26,232 @@ char **ctr;
 char *pcmcia = NULL;
 extern char url[STRING_SIZE];
 
-extern char *bz_tr[];
-extern char *cs_tr[];
-extern char *da_tr[];
 extern char *en_tr[];
-extern char *es_tr[];
-extern char *fi_tr[];
-extern char *fr_tr[];
-extern char *hu_tr[];
-extern char *la_tr[];
-extern char *nl_tr[];
 extern char *de_tr[];
-extern char *tr_tr[];
-extern char *it_tr[];
-extern char *el_tr[];
-extern char *pl_tr[];
-extern char *pt_tr[];
-extern char *so_tr[];
-extern char *sv_tr[];
-extern char *no_tr[];
-extern char *vi_tr[];
+
+int detect_smp() {
+       FILE *fd = NULL;
+       char line[STRING_SIZE];
+       int cpu_count = 0;
+
+       if ((fd = fopen("/proc/cpuinfo", "r")) == NULL) {
+               return 0;
+       }
+       while (fgets(line, STRING_SIZE, fd) != NULL) {
+               if (strstr(line, "processor") == line) {
+                       cpu_count++;
+               }
+       }
+       (void)fclose(fd);
+       return (cpu_count > 1);
+}
+
+int generate_packages_list(char *packages, const char *rpmdir, const char *source) {
+
+       FILE *fd=NULL;
+       char buffer[STRING_SIZE];
+       bzero(buffer, sizeof(buffer));
+
+       if ((fd = fopen(source, "r")) == NULL) {
+               (void) fprintf(flog, "Packages file %s not found\n", source);
+               return -1;
+       }
+       while (fgets(buffer, sizeof(buffer), fd) != NULL) {
+               int length = -1;
+               length = strlen(buffer)-1;
+               if (length<=0) {
+                       continue;
+               }
+               if (buffer[length] == '\n') {
+                       buffer[length]='\0';
+               }
+               length = snprintf(packages, STRING_SIZE, "%s %s/%s", strdup(packages), rpmdir, buffer);
+               if ((length <0) || (length >STRING_SIZE)) {
+                       (void) fprintf(flog, "rpm command line too long: %d\n%s", length, packages);
+                       return -1;
+               }
+       }
+       if (ferror(fd)) {
+               (void) fprintf(flog, "Error reading file\n");
+               (void) fclose(fd);
+               return -1;
+       }
+       (void) fclose(fd);
+       return 0;
+}
+
+long calc_swapsize(long memory, long disk) {
+       if (memory < 128) {
+               return 256;
+       }
+       if (memory > 1024) {
+               return 512;
+       }
+
+       return memory*2;
+}
+
+int unattended_setup(struct keyvalue *unattendedkv) {
+    struct keyvalue *mainsettings = initkeyvalues();
+    struct keyvalue *ethernetkv = initkeyvalues();
+    FILE *file, *hosts;
+    char commandstring[STRING_SIZE];
+
+    char domainname[STRING_SIZE];
+    char hostname[STRING_SIZE];
+    char keymap[STRING_SIZE];
+    char language[STRING_SIZE];
+    char timezone[STRING_SIZE];
+    char green_address[STRING_SIZE];
+    char green_netmask[STRING_SIZE];
+    char green_netaddress[STRING_SIZE];
+    char green_broadcast[STRING_SIZE];
+    char root_password[STRING_SIZE];
+    char admin_password[STRING_SIZE];
+    char serial_console[STRING_SIZE];
+    char reversesort[STRING_SIZE];
+
+    findkey(unattendedkv, "DOMAINNAME", domainname);
+    findkey(unattendedkv, "HOSTNAME", hostname);
+    findkey(unattendedkv, "KEYMAP", keymap);
+    findkey(unattendedkv, "LANGUAGE", language);
+    findkey(unattendedkv, "TIMEZONE", timezone);
+    findkey(unattendedkv, "GREEN_ADDRESS", green_address);
+    findkey(unattendedkv, "GREEN_NETMASK", green_netmask);
+    findkey(unattendedkv, "GREEN_NETADDRESS", green_netaddress);
+    findkey(unattendedkv, "GREEN_BROADCAST", green_broadcast);
+    findkey(unattendedkv, "ROOT_PASSWORD", root_password);
+    findkey(unattendedkv, "ADMIN_PASSWORD", admin_password);
+    findkey(unattendedkv, "SERIAL_CONSOLE", serial_console);
+    findkey(unattendedkv, "REVERSE_NICS", reversesort);
+
+    /* write main/settings. */
+    replacekeyvalue(mainsettings, "DOMAINNAME", domainname);
+    replacekeyvalue(mainsettings, "HOSTNAME", hostname);
+    replacekeyvalue(mainsettings, "KEYMAP", keymap);
+    replacekeyvalue(mainsettings, "LANGUAGE", language);
+    replacekeyvalue(mainsettings, "TIMEZONE", timezone);
+    writekeyvalues(mainsettings, "/harddisk" CONFIG_ROOT "/main/settings");
+    freekeyvalues(mainsettings);
+
+    /* do setup stuff */
+    fprintf(flog, "unattended: Starting setup\n");
+
+    /* network */
+
+    fprintf(flog, "unattended: setting up network configuration\n");
+
+    (void) readkeyvalues(ethernetkv, "/harddisk" CONFIG_ROOT "/ethernet/settings");
+    replacekeyvalue(ethernetkv, "GREEN_ADDRESS", green_address);
+    replacekeyvalue(ethernetkv, "GREEN_NETMASK", green_netmask);
+    replacekeyvalue(ethernetkv, "GREEN_NETADDRESS", green_netaddress);
+    replacekeyvalue(ethernetkv, "GREEN_BROADCAST", green_broadcast);
+    replacekeyvalue(ethernetkv, "CONFIG_TYPE", "0");
+    replacekeyvalue(ethernetkv, "GREEN_DEV", "br0");
+    write_ethernet_configs(ethernetkv);
+    freekeyvalues(ethernetkv);
+
+    /* timezone */
+    unlink("/harddisk/etc/localtime");
+    snprintf(commandstring, STRING_SIZE, "/harddisk/%s", timezone);
+    link(commandstring, "/harddisk/etc/localtime");
+
+    /* hostname */
+    fprintf(flog, "unattended: writing hostname.conf\n");
+    if (!(file = fopen("/harddisk" CONFIG_ROOT "/main/hostname.conf", "w")))
+    {
+       errorbox("unattended: ERROR writing hostname.conf");
+       return 0;
+    }
+    fprintf(file, "ServerName %s\n", hostname);
+    fclose(file);                                  
+
+    fprintf(flog, "unattended: writing hosts\n");
+    if (!(hosts = fopen("/harddisk/etc/hosts", "w")))
+    {
+       errorbox("unattended: ERROR writing hosts");
+       return 0;
+    }
+    fprintf(hosts, "127.0.0.1\tlocalhost\n");
+    fprintf(hosts, "%s\t%s.%s\t%s\n", green_address, hostname, domainname, hostname);
+    fclose(hosts);                                                             
+
+    fprintf(flog, "unattended: writing hosts.allow\n");
+    if (!(file = fopen("/harddisk/etc/hosts.allow", "w")))
+    {
+       errorbox("unattended: ERROR writing hosts.allow");
+        return 0;
+    }
+    fprintf(file, "sshd : ALL\n");
+    fprintf(file, "ALL  : localhost\n");
+    fprintf(file, "ALL  : %s/%s\n", green_netaddress, green_netmask);
+    fclose(file);
+
+    fprintf(flog, "unattended: writing hosts.deny\n");
+    if (!(file = fopen("/harddisk/etc/hosts.deny", "w")))
+    {
+       errorbox("unattended: ERROR writing hosts.deny");
+        return 0;
+    }
+    fprintf(file, "ALL : ALL\n");
+    fclose(file);
+
+    if (strcmp(serial_console, "yes") != 0) {
+           snprintf(commandstring, STRING_SIZE,
+                    "/bin/chroot /harddisk /bin/sed -i -e \"s/^s0/#s0/\" /etc/inittab");
+           if (mysystem(commandstring)) {
+                   errorbox("unattended: ERROR modifying inittab");
+                   return 0;    
+           }
+
+           snprintf(commandstring, STRING_SIZE,
+                    "/bin/chroot /harddisk /bin/sed -i -e \"s/^serial/#serial/; s/^terminal/#terminal/\" /boot/grub/grub.conf");
+           if (mysystem(commandstring)) {
+                   errorbox("unattended: ERROR modifying inittab");
+                   return 0;
+           }
+    }
+
+    /* set reverse sorting of interfaces */
+    if (strcmp(reversesort, "yes") == 0) {
+           mysystem("/bin/touch /harddisk/var/ipfire/ethernet/reverse_nics");
+    }
+
+    /* set root password */
+    fprintf(flog, "unattended: setting root password\n");
+    
+    snprintf(commandstring, STRING_SIZE,
+           "/bin/chroot /harddisk /bin/sh -c \"echo 'root:%s' | /usr/sbin/chpasswd\"", root_password);
+    if (mysystem(commandstring)) {
+       errorbox("unattended: ERROR setting root password");
+       return 0;
+    }
+    
+    /* set admin password */
+    fprintf(flog, "unattended: setting admin password\n");
+    snprintf(commandstring, STRING_SIZE,
+           "/bin/chroot /harddisk /usr/bin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", admin_password);
+    if (mysystem(commandstring)) {
+       errorbox("unattended: ERROR setting admin password");
+       return 0;    
+    }
+    
+    return 1;                                                          
+}
 
 int main(int argc, char *argv[])
 {
-#ifdef LANG_EN_ONLY
-        char *langnames[] = { "English", NULL };
-        char *shortlangnames[] = { "en", NULL };
-        char **langtrs[] = { en_tr, NULL };
-#elifdef       LANG_ALL
-       char *langnames[] = { "Brasil", "Cestina", "Dansk", "Deutsch", "English", "Español", "Français", "Hellenic", "Italiano", "Spanish Latino", "Magyar", "Nederlands", "Norsk", "Polski", "Português", "Soomali", "Suomi", "Svenska", "Türkçe", "Tieng Viet", NULL };
-       char *shortlangnames[] = { "bz", "cs", "da", "de", "en", "es", "fr", "el", "it", "la", "hu", "nl", "no", "pl", "pt", "so", "fi", "sv", "tr", "vi", NULL };
-       char **langtrs[] = { bz_tr, cs_tr, da_tr, de_tr, en_tr, es_tr, fr_tr, el_tr, it_tr, la_tr, hu_tr, nl_tr, no_tr, pl_tr, pt_tr, so_tr, fi_tr, sv_tr, tr_tr, vi_tr, NULL };        
-#else
        char *langnames[] = { "Deutsch", "English", NULL };
        char *shortlangnames[] = { "de", "en", NULL };
        char **langtrs[] = { de_tr, en_tr, NULL };
-#endif
        char hdletter, cdletter;
-       char harddrive[5], cdromdrive[5];       /* Device holder. */
-       struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
-       int cdmounted = 0;              /* Loop flag for inserting a cd. */ 
-       int rc;
+       char harddrive[5], 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", "HTTP/FTP", NULL };
-       int installtype = CDROM_INSTALL; 
+       int installtype = CDROM_INSTALL;
        char insertmessage[STRING_SIZE];
        char insertdevnode[STRING_SIZE];
        int choice;
@@ -81,20 +265,28 @@ int main(int argc, char *argv[])
        FILE *handle, *cmdfile;
        char line[STRING_SIZE];
        char string[STRING_SIZE];
-       int maximum_free = 0, current_free;
-       int memory = 0;
-       int log_partition, boot_partition, root_partition, swap_file;
+       long maximum_free = 0, current_free;
+       long memory = 0;
+       long log_partition, boot_partition, root_partition, swap_file;
        int scsi_disk = 0;
        int pcmcia_disk = 0;
        int pcmcia_cdrom = 0;
        int scsi_cdrom = 0;
        int ide_cdrom = 0;
        int fdisk = 0;
-
+       int hardyn = 0;
+       char *yesnoharddisk[] = { "NO", "YES", NULL };
+       char *yesno[] = { "NO", "YES", NULL };
+       char green[STRING_SIZE];
+       int unattended = 0;
+       struct keyvalue *unattendedkv = initkeyvalues();
+       char packages[STRING_SIZE];
+       int serial_console = 0;
+       char megabridge[STRING_SIZE];
 
        setlocale (LC_ALL, "");
        sethostname( SNAME , 10);
-       
+
        memset(&hdparams, 0, sizeof(struct devparams));
        memset(&cdromparams, 0, sizeof(struct devparams));
 
@@ -147,9 +339,18 @@ int main(int argc, char *argv[])
                } else {
                        fprintf(flog, "Skipping USB detection.\n");
                }
+               // check if we have to make an unattended install
+               if (strstr (line, "unattended") != NULL) {              
+                   unattended = 1;
+               }
        }
+
+       // make some beeps before wiping the system :)
+       if (unattended) {
+           runcommandwithstatus("/bin/beep -f 450 -r 10 -D 800 -n -f 900 -l 1000", "WARNING: Unattended installation will start in 10 seconds...");
+       }
        
-       /* Deutsch is the default */
+       /* German is the default */
        for (choice = 0; langnames[choice]; choice++)
        {
                if (strcmp(langnames[choice], "Deutsch") == 0)
@@ -158,49 +359,331 @@ int main(int argc, char *argv[])
        if (!langnames[choice])
                goto EXIT;
 
-#ifdef LANG_EN_ONLY
-       /* No need to ask.  "choice" already has the index for English */
-#else
-       rc = newtWinMenu("Language selection",
-               "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
-               langnames, &choice, "Ok", NULL);
-#endif
+       if (!unattended) {
+           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]);
-       if (strcmp(shortlangname, "el") == 0)
-               mysystem("/bin/setfont iso07u-16");
-       else if (strcmp(shortlangname, "pt") == 0)
-               mysystem("/bin/setfont lat1-16");
-       else if (strcmp(shortlangname, "bz") == 0)
-               mysystem("/bin/setfont lat1-16");
-       else if (strcmp(shortlangname, "cs") == 0)
-               mysystem("/bin/setfont lat2-16");
-       else if (strcmp(shortlangname, "hu") == 0)
-               mysystem("/bin/setfont lat2-16");
-       else if (strcmp(shortlangname, "pl") == 0)
-               mysystem("/bin/setfont lat2-16");
-       else if (strcmp(shortlangname, "tr") == 0)
-               mysystem("/bin/setfont lat5-16");
-       else if (strcmp(shortlangname, "vi") == 0)
-               mysystem("/bin/setfont viscii10-8x16");
-       else
-               mysystem("/bin/setfont lat0-16");
-       
+
+       mysystem("/bin/setfont lat0-16");
+
        newtDrawRootText(14, 0, NAME " v" VERSION " - " SLOGAN );
        newtPushHelpLine(ctr[TR_HELPLINE]);
 
-       sprintf(message, ctr[TR_WELCOME], NAME);
-       sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN);
-       newtWinMessage(title, ctr[TR_OK], message);
+       if (!unattended) {
+               sprintf(message, ctr[TR_WELCOME], NAME);
+               sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
+               newtWinMessage(title, ctr[TR_OK], message);
+
+               sprintf(message, ctr[TR_SELECT_INSTALLATION_MEDIA_LONG], NAME);
+               rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
+                       50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
+                       ctr[TR_CANCEL], NULL);
+       }
+       else {
+           rc = 1;
+           installtype = CDROM_INSTALL;
+       }
+
+       if (rc == 2)
+               goto EXIT;
+
+       // Starting hardware detection
+       runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
+
+       switch (mysystem("/bin/mountsource.sh")) {
+           case 0:
+               installtype = CDROM_INSTALL;
+               cdmounted = 1;
+               break;
+           case 1:
+               installtype = DISK_INSTALL;
+               break;
+           case 10:
+               errorbox(ctr[TR_NO_CDROM]);
+               goto EXIT;
+       }
+
+       /* read source drive letter */
+       if ((handle = fopen("/source_device", "r")) == NULL) {
+           errorbox("ERROR reading source_device");
+       }
+       fgets(sourcedrive, 5, handle);
+       fprintf(flog, "Source drive: %s\n", sourcedrive);
+       fclose(handle);
+       
+       if (installtype == CDROM_INSTALL) {
+           snprintf(cdromparams.devnode, STRING_SIZE, "/dev/%s", sourcedrive);
+           cdromparams.module = 0;
+           fprintf(flog, "Source device: %s\n", cdromparams.devnode);
+       }
+
+       /* Get device for the HD.  This has to succeed. */
+       if (!(hdletter = findidetype(IDE_HD)))
+       {
+               /* Need to clean this up at some point */
+               if (!try_scsi("sda") || strstr(sourcedrive, "sda") != NULL) {
+                       if (!try_scsi("ida/c0d0")) {
+                               if (!try_scsi("cciss/c0d0")) {
+                                       if (!try_scsi("rd/c0d0")) {
+                                               if (!try_scsi("ataraid/d0")) {
+                                                       errorbox(ctr[TR_NO_HARDDISK]);
+                                                       goto EXIT;
+                                               } else {
+                                                       raid_disk = 1;
+                                                       sprintf(harddrive, "ataraid/d0");
+                                               }
+                                       } else {
+                                               raid_disk = 1;
+                                               sprintf(harddrive, "rd/c0d0");
+                                       }
+                               } else {
+                                       raid_disk = 1;
+                                       sprintf(harddrive, "cciss/c0d0");
+                               }
+                       } else {
+                               raid_disk = 1;
+                               sprintf(harddrive, "ida/c0d0");
+                       }
+               } else {
+                   if (strstr(sourcedrive, "sda") != NULL) {
+                       // probably installing from usb stick, try sdb
+                       if (try_scsi("sdb")) {
+                           sprintf(harddrive, "sdb");
+                       }
+                       else {
+                           errorbox(ctr[TR_NO_HARDDISK]);
+                           goto EXIT;
+                       }
+                   }
+                   else {
+                       sprintf(harddrive, "sda");
+                   }
+               }
+               scsi_disk = 1;
+       } else
+               sprintf(harddrive, "hd%c", hdletter);
+
+
+       /* load unattended configuration */
+       if (unattended) {
+           fprintf(flog, "unattended: Reading unattended.conf\n");
+
+           (void) readkeyvalues(unattendedkv, UNATTENDED_CONF);
+       }
+
+       /* Make the hdparms struct and print the contents. */
+       snprintf(hdparams.devnode, STRING_SIZE, "/dev/%s", harddrive);
+       hdparams.module = 0;
 
-       sprintf(message, ctr[TR_SELECT_INSTALLATION_MEDIA_LONG], NAME);
-       rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
-               50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
-               ctr[TR_CANCEL], NULL);
+       sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode);
+       
+       if (unattended) {
+           hardyn = 1;
+       }
+       
+       while (! hardyn) {
+               rc = newtWinMenu(title, message,
+                                50, 5, 5, 6, yesnoharddisk,
+                                &hardyn, ctr[TR_OK],
+                                ctr[TR_CANCEL], NULL);
+               if (rc == 2)
+                       goto EXIT;
+       }
 
        if (rc == 2)
                goto EXIT;
-                                       
+
+       /* Calculate amount of memory in machine */
+        if ((handle = fopen("/proc/meminfo", "r")))
+        {
+            while (fgets(line, STRING_SIZE-1, handle)) {
+                if (sscanf (line, "MemTotal: %s kB", string)) {
+                    memory = atoi(string) / 1024 ;
+                }
+            }
+            fclose(handle);
+        }
+
+       /* Partition, mkswp, mkfs.
+        * before partitioning, first determine the sizes of each
+        * partition.  In order to do that we need to know the size of
+        * the disk. 
+        */
+       /* Don't use mysystem here so we can redirect output */
+       sprintf(commandstring, "/bin/sfdisk -s /dev/%s > /disksize 2> /dev/null", harddrive);
+       system(commandstring);
+
+       /* Calculate amount of disk space */
+        if ((handle = fopen("/disksize", "r")))
+        {
+               fgets(line, STRING_SIZE-1, handle);
+               if (sscanf (line, "%s", string)) {
+                       maximum_free = atoi(string) / 1024;
+               }
+               fclose(handle);
+        }
+       
+       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) {
+                       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 = 10; /* in MB */
+       current_free = maximum_free - boot_partition - swap_file;
+
+       root_partition = current_free / 3 ;
+       if (current_free < 400) {
+               errorbox(ctr[TR_DISK_TOO_SMALL]);
+               goto EXIT;
+       }
+
+       current_free = current_free - root_partition;
+       if (!swap_file) {
+               root_partition = root_partition + swap_file;
+       }
+
+       log_partition = current_free;
+
+       fprintf(flog, "boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
+               boot_partition, swap_file, log_partition, root_partition);
+
+       handle = fopen("/tmp/partitiontable", "w");
+
+
+       /* Make swapfile */
+       if (swap_file) {
+               fprintf(handle, ",%ld,L,*\n,%ld,S,\n,%ld,L,\n,,L,\n",
+                       boot_partition, swap_file, root_partition);
+       } else {
+               fprintf(handle, ",%ld,L,*\n,0,0,\n,%ld,L,\n,,L,\n",
+                       boot_partition, root_partition);
+       }
+
+       fclose(handle);
+
+       snprintf(commandstring, STRING_SIZE, "/bin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode);
+       if (runcommandwithstatus(commandstring, ctr[TR_PARTITIONING_DISK]))
+       {
+               errorbox(ctr[TR_UNABLE_TO_PARTITION]);
+               goto EXIT;
+       }
+
+       mysystem("/bin/udevstart");
+
+       if (raid_disk)
+               snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext3 -c %sp1", hdparams.devnode);  
+       else
+               snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext3 -c %s1", hdparams.devnode);
+       if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM]))
+       {
+               errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]);
+               goto EXIT;
+       }
+
+       if (swap_file) {
+               if (raid_disk)
+                       snprintf(commandstring, STRING_SIZE, "/bin/mkswap %sp2", hdparams.devnode);     
+               else
+                       snprintf(commandstring, STRING_SIZE, "/bin/mkswap %s2", hdparams.devnode);
+               if (runcommandwithstatus(commandstring, ctr[TR_MAKING_SWAPSPACE]))
+               {
+                       errorbox(ctr[TR_UNABLE_TO_MAKE_SWAPSPACE]);
+                       goto EXIT;
+               }
+       }
+
+       if (raid_disk)
+               snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext3 %sp3", hdparams.devnode);     
+       else
+               snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext3 %s3", hdparams.devnode);      
+
+       if (runcommandwithstatus(commandstring, ctr[TR_MAKING_ROOT_FILESYSTEM]))
+       {
+               errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
+               goto EXIT;
+       }
+
+       if (raid_disk)
+               snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext3 %sp4", hdparams.devnode);     
+       else
+               snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext3 %s4", hdparams.devnode);      
+
+       if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
+       {
+               errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
+               goto EXIT;
+       }
+
+       /* Mount harddisk. */
+       if (raid_disk)
+               snprintf(commandstring, STRING_SIZE, "/sbin/mount %sp3 /harddisk", hdparams.devnode);
+       else
+               snprintf(commandstring, STRING_SIZE, "/sbin/mount %s3 /harddisk", hdparams.devnode);
+       if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_ROOT_FILESYSTEM]))
+       {
+               errorbox(ctr[TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM]);
+               goto EXIT;
+       }
+
+       mkdir("/harddisk/boot", S_IRWXU|S_IRWXG|S_IRWXO);
+       mkdir("/harddisk/var", S_IRWXU|S_IRWXG|S_IRWXO);
+       mkdir("/harddisk/var/log", S_IRWXU|S_IRWXG|S_IRWXO);
+       
+       if (raid_disk)
+               snprintf(commandstring, STRING_SIZE, "/sbin/mount %sp1 /harddisk/boot", hdparams.devnode);
+       else
+               snprintf(commandstring, STRING_SIZE, "/sbin/mount %s1 /harddisk/boot", hdparams.devnode);
+
+       if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_BOOT_FILESYSTEM]))
+       {
+               errorbox(ctr[TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM]);
+               goto EXIT;
+       }
+       if (swap_file) {
+               if (raid_disk)
+                       snprintf(commandstring, STRING_SIZE, "/bin/swapon %sp2", hdparams.devnode);
+               else
+                       snprintf(commandstring, STRING_SIZE, "/bin/swapon %s2", hdparams.devnode);
+               if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_SWAP_PARTITION]))
+               {
+                       errorbox(ctr[TR_UNABLE_TO_MOUNT_SWAP_PARTITION]);
+                       goto EXIT;
+               }
+       }
+       if (raid_disk)
+               snprintf(commandstring, STRING_SIZE, "/sbin/mount %sp4 /harddisk/var", hdparams.devnode);
+       else
+               snprintf(commandstring, STRING_SIZE, "/sbin/mount %s4 /harddisk/var", hdparams.devnode);
+       if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_LOG_FILESYSTEM]))
+       {
+               errorbox(ctr[TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM]);
+               goto EXIT;
+       }
+
+
+
        if (installtype == CDROM_INSTALL)
        {       
                /* First look for an IDE CDROM. */
@@ -238,8 +721,8 @@ int main(int argc, char *argv[])
                                /* try loading all SCSI modules with default options */
                                /* Should expand this to allow options later though */
                                if (!pcmcia_cdrom)
-                                   runcommandwithstatus("/bin/probescsi.sh",
-                                       ctr[TR_PROBING_SCSI]);
+                                   runcommandwithstatus("/bin/probehw.sh",
+                                       ctr[TR_PROBING_HARDWARE]);
        
                                /* If it fails, give up. */
                                if (!(try_scsi("scd0"))) {
@@ -248,14 +731,14 @@ int main(int argc, char *argv[])
                                }
                        }
 
-                       sprintf(cdromdrive, "scd0");
+                       sprintf(sourcedrive, "scd0");
                        scsi_cdrom = 1;
                } else {
-                       sprintf(cdromdrive, "hd%c", cdletter);
+                       sprintf(sourcedrive, "hd%c", cdletter);
                        ide_cdrom = 1;
                }
 
-               snprintf(cdromparams.devnode, STRING_SIZE, "/dev/%s", cdromdrive);
+               snprintf(cdromparams.devnode, STRING_SIZE, "/dev/%s", sourcedrive);
                cdromparams.module = 0;
                
                sprintf(insertmessage, ctr[TR_INSERT_CDROM], NAME);
@@ -458,8 +941,8 @@ int main(int argc, char *argv[])
                        /* try loading all SCSI modules with default options */
                        /* Should expand this to allow options later though */
                        if (!pcmcia_disk)
-                               runcommandwithstatus("/bin/probescsi.sh",
-                                       ctr[TR_PROBING_SCSI]);
+                               runcommandwithstatus("/bin/probehw.sh",
+                                       ctr[TR_PROBING_HARDWARE]);
                }
        
                /* Need to clean this up at some point */