]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/install+setup/install/main.c
Installer-Pfade gefixxt.
[people/pmueller/ipfire-2.x.git] / src / install+setup / install / main.c
index 4b17e2e182bb89c8235522bc61dafa1f8446ecc2..f3d665f2c63053b8c8d2fee7162651a58ee56a6c 100644 (file)
  * (c) Lawrence Manning, 2001
  * Contains main entry point, and misc functions.
  * 
- * $Id: main.c,v 1.63.2.64 2006/01/11 01:01:38 franck78 Exp $
- * 
  */
-#include "install.h"
 
+#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/boot/unattended.conf"
 
 int raid_disk = 0;
 FILE *flog = NULL;
 char *mylog;
+
 char **ctr;
 
 char *pcmcia = NULL;
 extern char url[STRING_SIZE];
 
-/* 
-    To include a translated string in the final installer, you must reference
-    it here with a simplr comment. This save a lot a space in the installer
-*/
-/* TR_WELCOME */
-/* TR_HELPLINE */
-/* TR_OK */
-/* TR_ERROR */
-/* TR_SELECT_INSTALLATION_MEDIA_LONG */
-/* TR_SELECT_INSTALLATION_MEDIA */
-/* TR_CANCEL */
-/* TR_INSERT_FLOPPY */
-/* TR_INSTALLATION_CANCELED */
-/* TR_EXTRACTING_MODULES */
-/* TR_UNABLE_TO_EXTRACT_MODULES */
-/* TR_LOADING_PCMCIA */
-/* TR_PROBING_SCSI */
-/* TR_NO_CDROM */
-/* TR_INSERT_CDROM */
-/* TR_USB_KEY_VFAT_ERR */
-/* TR_NETWORK_SETUP_FAILED */
-/* TR_NO_IPCOP_TARBALL_FOUND */
-/* TR_NO_SCSI_IMAGE_FOUND */
-/* TR_INSTALLING_FILES */
-/* TR_UNABLE_TO_INSTALL_FILES */
-/* TR_NO_HARDDISK */
-/* TR_PREPARE_HARDDISK */
-/* TR_DISK_TOO_SMALL */
-/* TR_CONTINUE_NO_SWAP */
-/* TR_PARTITIONING_DISK */
-/* TR_UNABLE_TO_PARTITION */
-/* TR_MAKING_BOOT_FILESYSTEM */
-/* TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM */
-/* TR_MAKING_LOG_FILESYSTEM */
-/* TR_UNABLE_TO_MAKE_LOG_FILESYSTEM */
-/* TR_MAKING_ROOT_FILESYSTEM */
-/* TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM */
-/* TR_MOUNTING_ROOT_FILESYSTEM */
-/* TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM */
-/* TR_MAKING_SWAPSPACE */
-/* TR_UNABLE_TO_MAKE_SWAPSPACE */
-/* TR_MOUNTING_SWAP_PARTITION */
-/* TR_UNABLE_TO_MOUNT_SWAP_PARTITION */
-/* TR_MOUNTING_BOOT_FILESYSTEM */
-/* TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM */
-/* TR_MOUNTING_LOG_FILESYSTEM */
-/* TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM */
-/* TR_ERROR_WRITING_CONFIG */
-/* TR_INSTALLING_GRUB */
-/* TR_UNABLE_TO_INSTALL_GRUB */
-/* TR_UNABLE_TO_UNMOUNT_CDROM */
-/* TR_UNABLE_TO_EJECT_CDROM */
-/* TR_CONGRATULATIONS_LONG */
-/* TR_CONGRATULATIONS */
-/* TR_PRESS_OK_TO_REBOOT */
-
-// in nic.c
-/* TR_CONFIGURE_NETWORKING */
-/* TR_PROBE */
-/* TR_SELECT */
-/* TR_CONFIGURE_NETWORKING_LONG */
-/* TR_PROBE_FAILED */
-/* TR_FOUND_NIC */
-/* TR_INTERFACE_FAILED_TO_COME_UP */
-
-//netc.c
-/* TR_CHECKING */
-/* TR_FAILED_TO_FIND */
-/* TR_ENTER_URL */
-
-//setup.c
-/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK1 */
-/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK2 */
-/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK3 */
-/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK4 */
-/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_HARDDISK */
-/* TR_UNABLE_TO_MAKE_SYMLINK_DEV_ROOT */
-/* TR_PASSWORD_PROMPT */
-/* TR_AGAIN_PROMPT */
-/* TR_PASSWORD_CANNOT_BE_BLANK */
-/* TR_PASSWORDS_DO_NOT_MATCH */
-
-//libsmooth
-/* TR_INTERFACE */
-/* TR_ENTER_THE_IP_ADDRESS_INFORMATION */
-/* TR_STATIC */
-/* TR_DHCP_HOSTNAME */
-/* TR_IP_ADDRESS_PROMPT */
-/* TR_NETMASK_PROMPT */
-/* TR_INVALID_FIELDS */
-/* TR_IP_ADDRESS_CR */
-/* TR_NETWORK_MASK_CR */
-/* TR_DHCP_HOSTNAME_CR */
-/* TR_LOOKING_FOR_NIC */
-/* TR_MANUAL */
-/* TR_SELECT_NETWORK_DRIVER */
-/* TR_SELECT_NETWORK_DRIVER_LONG */
-/* TR_UNABLE_TO_LOAD_DRIVER_MODULE */
-/* TR_THIS_DRIVER_MODULE_IS_ALREADY_LOADED */
-/* TR_MODULE_PARAMETERS */
-/* TR_LOADING_MODULE */
-/* TR_MODULE_NAME_CANNOT_BE_BLANK */
+extern char *en_tr[];
+extern char *de_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", "eth0");
+    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,
+                    "/sbin/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,
+                    "/sbin/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,
+           "/sbin/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,
+           "/sbin/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 };
-#else
-       char *langnames[] = { "Brasil", "Cestina", "Dansk", "Deutsch", "English", "Español", "Français", "Hellenic", "Italiano", "Spanish Latino", "Magyar", "Nederlands", "Norsk", "Polski", "Português", "Slovak", "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", "sk", "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, sk_tr, so_tr, fi_tr, sv_tr, tr_tr, vi_tr, NULL };
-#endif
+       char *langnames[] = { "Deutsch", "English", NULL };
+       char *shortlangnames[] = { "de", "en", NULL };
+       char **langtrs[] = { de_tr, en_tr, NULL };
        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/USB-KEY", "HTTP/FTP", NULL };
-       int installtype = CDROM_INSTALL; 
+       char *installtypes[] = { "CDROM", "HTTP/FTP", NULL };
+       int installtype = CDROM_INSTALL;
        char insertmessage[STRING_SIZE];
        char insertdevnode[STRING_SIZE];
        int choice;
@@ -152,26 +259,34 @@ int main(int argc, char *argv[])
        char message[1000];
        char title[STRING_SIZE];
        int allok = 0;
-       int no_restore=0;
+       int allok_fastexit=0;
        int unmount_before=0;
        struct keyvalue *ethernetkv = initkeyvalues();
        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 system_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 usb_cdrom = 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);
-       
+       sethostname( SNAME , 10);
+
        memset(&hdparams, 0, sizeof(struct devparams));
        memset(&cdromparams, 0, sizeof(struct devparams));
 
@@ -224,435 +339,181 @@ 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/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
+       }
        
-       /* English is the default */
+       /* German is the default */
        for (choice = 0; langnames[choice]; choice++)
        {
-               if (strcmp(langnames[choice], "English") == 0)
+               if (strcmp(langnames[choice], "Deutsch") == 0)
                        break;
        }
        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, "sk") == 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");
 
-       /* need this for reading from formatted device */
-       modprobe("vfat");
+       mysystem("/bin/setfont lat0-16");
 
-       newtDrawRootText(14, 0, NAME " v" VERSION " - " SLOGAN );
+       newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
        newtPushHelpLine(ctr[TR_HELPLINE]);
 
-       snprintf(message, STRING_SIZE, ctr[TR_WELCOME], NAME);
-       snprintf (title, STRING_SIZE, "%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);
 
-       snprintf(message,STRING_SIZE, 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_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;
 
-       if (installtype == CDROM_INSTALL)  // CD or USB-key
-       {
-
-               /* try usb key in superfloppy format only */
-               if (checkusb("sda")) {
-                       sprintf(cdromdrive, "sda");
-                       usb_cdrom = 1;
-                       goto FOUND_SOURCE;
-               }
-               if (checkusb("sdb")) {
-                       sprintf(cdromdrive, "sdb");
-                       usb_cdrom = 1;
-                       goto FOUND_SOURCE;
-               }
+       // Starting hardware detection
+       runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
 
-               /* look for an IDE CDROM. */
-               if ((cdletter = findidetype(IDE_CDROM)))
-               {
-                       sprintf(cdromdrive, "hd%c", cdletter);
-                       ide_cdrom = 1;
-                       goto FOUND_SOURCE;
-               }
+       /* CDROM INSTALL */
+       if (installtype == CDROM_INSTALL) {
 
-               /* If we have a USB attached CDROM then it will
-                * have already appeared at /dev/scd0, so we
-                * try to access it first, before asking for the
-                * SCSI drivers disk.
-                */
-               if (try_scsi("scd0")) {
-                       sprintf(cdromdrive, "scd0");
-                       scsi_cdrom = 1;
-                       goto FOUND_SOURCE;
-               }
-
-               /* ask for supplemental  SCSI driver */
-               snprintf(insertmessage, STRING_SIZE, ctr[TR_INSERT_FLOPPY], NAME" SCSI");
-               if (newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], insertmessage) != 1)
-               {
-                       errorbox(ctr[TR_INSTALLATION_CANCELED]);
+               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;
                }
 
-               /* extract new modules */
-               if (runcommandwithstatus("/bin/tar -C / -xvzf /dev/floppy", ctr[TR_EXTRACTING_MODULES]))
-               {
-                       errorbox(ctr[TR_UNABLE_TO_EXTRACT_MODULES]);
+               /* read source drive letter */
+               if ((handle = fopen("/source_device", "r")) == NULL) {
+                       errorbox(ctr[TR_ERROR_PROBING_CDROM]);
                        goto EXIT;
                }
-               /* and load PCMCIA */
-               if (pcmcia)
-               {
-                       /* trying to support SCSI pcmcia :-) */
-                       runcommandwithstatus("cardmgr -o -c /etc/pcmcia/scsi",
-                               ctr[TR_LOADING_PCMCIA]);
-                       if (try_scsi("scd0")) {
-                               sprintf(cdromdrive, "scd0");
-                               pcmcia_cdrom = 1;
-                               goto FOUND_SOURCE;
-                       }
-               }
-
-               /* try loading all SCSI modules with default options */
-               /* Should expand this to allow options later though */
-               runcommandwithstatus("/bin/probescsi.sh", ctr[TR_PROBING_SCSI]);
-
-               /* If it fails, give up. */
-               if (try_scsi("scd0")) {
-                       sprintf(cdromdrive, "scd0");
-                       scsi_cdrom = 1;
-                       goto FOUND_SOURCE;
-               }
-
-               /* Unable to find a valid source, give up */
-               errorbox(ctr[TR_NO_CDROM]);
-               goto EXIT;
-
-               FOUND_SOURCE:
-               sprintf(cdromparams.devnode_disk, "/dev/%s", cdromdrive);
-//             cdromparams.module = 0;
-
-               snprintf(insertmessage,STRING_SIZE ,ctr[TR_INSERT_CDROM], NAME);
-               strcpy (insertdevnode, cdromparams.devnode_disk);
-       }
-       else    /* don't understand why this follows... */
-       {
-               /* If we've done a PXE boot, we can skip the Drivers floppy,
-                * as we've already got the modules in our instroot.gz */
-               if (!(handle = fopen("/CDROMBOOT", "r"))) {
-                       snprintf(insertmessage, STRING_SIZE-12, ctr[TR_INSERT_FLOPPY], NAME);
-                       strcpy (insertdevnode , "/dev/floppy");
-               } else {
-                       fclose(handle);
-                       cdmounted = 1;
-                       unmount_before = 1;
-               }
-       }
-
-       /* Try to mount /cdrom with the device discovered */
-       if (scsi_cdrom || ide_cdrom || usb_cdrom) {
-               snprintf(commandstring, STRING_SIZE, "/bin/mount -o ro %s /cdrom", insertdevnode);
-               int skip_dialog = 1;
-               int sd_test = 0;
-               while (!cdmounted)
-               {
-                       /* for usb-key, we have to try sda then sda1. The key cannot be unpluged */
-                       if (sd_test == 1) { //change to sda1
-                               sprintf(commandstring, "/bin/mount -o ro %s1 /cdrom", insertdevnode);
-                       }
-                       if (sd_test == 2) { //the key do not contains a vfat file system
-                               errorbox(ctr[TR_USB_KEY_VFAT_ERR]);
-                               goto EXIT;
-                       }
-                       if (usb_cdrom) sd_test++;       // next USB test
-                       
-                       if (!skip_dialog && !usb_cdrom) {
-                           rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], insertmessage);
-                           if (rc != 1)
-                           {
-                               errorbox(ctr[TR_INSTALLATION_CANCELED]);
-                               goto EXIT;
-                           }
-                       }
-                       skip_dialog = 0;
-                       if (mysystem(commandstring))
-                           continue; //mount failed, try again
-
-                       /*verify it's what we want */
-                       handle = fopen ("/cdrom/" SNAME "-" VERSION ".tgz", "r");
-                       if (handle == NULL) {
-                               mysystem ("/bin/umount /cdrom");
-                               continue;   /* bad disk ! */
-                       }
+               fgets(sourcedrive, 5, handle);
+               fprintf(flog, "Source drive: %s\n", sourcedrive);
+               fclose(handle);
 
-                       fclose (handle);
-                               cdmounted = 1;
-                       /* If we've booted from CDROM, then
-                        * we've already got the drivers,
-                        * so we can skip this unpack. */
-                       if ((handle = fopen("/CDROMBOOT", "r"))) {
-                               fclose(handle);
-                               break;  /* ok we go everything */
-                       }
-                       /* unpack drivers */
-                       if (runcommandwithprogress(60, 4, title,
-                                               "/bin/tar -C / -xvzf /cdrom/images/drivers-"VERSION".img",
-                                               175, ctr[TR_EXTRACTING_MODULES]))
-                       {
-                               errorbox(ctr[TR_UNABLE_TO_EXTRACT_MODULES]);
-                               goto EXIT;
-                       }
-               }
-       } else { /* no cd device were discovered,  ask second diskette */
-               sprintf(commandstring, "/bin/tar -C / -xvzf /dev/floppy");
-               while (!cdmounted)
-               {
-                       rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], insertmessage);
-                       if (rc != 1)
-                       {
-                               errorbox(ctr[TR_INSTALLATION_CANCELED]);
-                               goto EXIT;
-                       }
-                       if (runcommandwithprogress(60, 4, title, 
-                               commandstring,
-                               175, ctr[TR_EXTRACTING_MODULES]))
-                       {
-#if 0 /* disable this, so we allow for people putting in the wrong disk */
-                               errorbox(ctr[TR_UNABLE_TO_EXTRACT_MODULES]);
-                               goto EXIT;
-#endif
-                       }
-                       else
-                       {
-                               handle = fopen ("/bin/mke2fs", "r");
-                               if (handle != NULL) {
-                                       fclose (handle);
-                                               cdmounted = 1;
-                               }
-                       }
-               }
+               snprintf(cdromparams.devnode, STRING_SIZE, "/dev/%s", sourcedrive);
+               cdromparams.module = 0;
+               fprintf(flog, "Source device: %s\n", cdromparams.devnode);
        }
 
-       /* PCMCIA controller is already detected
-        * On Boot floppy, we didn't have the PCMCIA drivers
-        * so load them now because they are installed from Drivers. */
-       if (!(handle = fopen("/CDROMBOOT", "r"))) {
-               if (strstr (line, "nopcmcia") == NULL) {
-                       fprintf(flog,"Floppy boot detected, loading PCMCIA drivers.\n");
-                       if (pcmcia) {
-                               fprintf (flog, "Detected PCMCIA Controller: %s.\n", pcmcia);
-                               sprintf(commandstring, "/sbin/modprobe %s", pcmcia);
-                               mysystem("/sbin/modprobe pcmcia_core");
-                               mysystem(commandstring);
-                               mysystem("/sbin/modprobe ds");
-                       } else {
-                               fprintf (flog, "Detected No PCMCIA Controller.\n");
-                       }
-               } else {
-                       fprintf(flog, "Skipping PCMCIA detection.\n");
-               }
-               if (strstr (line, "nousb") == NULL) {
-                       fprintf(flog, "Initializing USB controllers.\n");
-                       initialize_usb();
-               } else {
-                       fprintf(flog, "Skipping USB detection.\n");
+       /* Configure the network now! */
+       if (installtype == URL_INSTALL) {
+               /* Network driver and params. */
+               if (!(networkmenu(ethernetkv))) {
+                       errorbox(ctr[TR_NETWORK_SETUP_FAILED]);
+                       goto EXIT;
                }
-       } else
-               fclose(handle);
 
-       /* Configure the network now! */
-       if (installtype == URL_INSTALL)
-       {
-               /* Network driver and params. */
-               if (!(networkmenu(ethernetkv)))
-               {
-                       errorbox(ctr[TR_NETWORK_SETUP_FAILED]);
-                       goto EXIT;
-               }
-
-               /* Check for ipcop-<VERSION>.tgz */
-               if (!(checktarball(SNAME "-" VERSION ".tgz")))
-               {
+               /* Check for ipcop-<VERSION>.tbz2 */
+               if (checktarball(SNAME "-" VERSION ".tbz2", ctr[TR_ENTER_URL])) {
                        errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]);
                        goto EXIT;
                }
        }
 
        /* Get device for the HD.  This has to succeed. */
-       /* first try an IDE disk */
-       if ((hdletter = findidetype(IDE_HD)))
+       if (!(hdletter = findidetype(IDE_HD)))
        {
-               sprintf(harddrive, "hd%c", hdletter);
-               goto FOUND_DESTINATION;
-       }
-       /* unpack SCSI driver if not done during CD detection */
-       if (installtype == URL_INSTALL)
-       {
-               /* If we've done a PXE boot, we can skip the SCSI
-                * floppy as we've already got the modules in our 
-                * instroot.gz */
-               if (!(handle = fopen("/CDROMBOOT", "r"))) 
-               {
-                       /* search img where it is on a mounted loop iso */
-                       if (!(checktarball("images/scsidrv-"VERSION".img")))
-                       {
-                               /* Couldn't find the SCSI drivers on the URL page,
-                                * so after 3 failed attempts, ask the user for the
-                                * SCSI drivers floppy disk. */
-                               errorbox(ctr[TR_NO_SCSI_IMAGE_FOUND]);
-                               snprintf(insertmessage, STRING_SIZE, ctr[TR_INSERT_FLOPPY], NAME" SCSI");
-                               rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], insertmessage);
-                               if (rc != 1)
-                               {
-                                       errorbox(ctr[TR_INSTALLATION_CANCELED]);
-                                       goto EXIT;
-                               }
-
-                               if (runcommandwithstatus("/bin/tar -C / -xvzf /dev/floppy", ctr[TR_EXTRACTING_MODULES]))
-                               {
-                                       errorbox(ctr[TR_UNABLE_TO_EXTRACT_MODULES]);
-                                       goto EXIT;
+               /* 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 {
-                               /* unpack... THIS DO NOT WORK BECAUSE var "string" is empty*/
-                               snprintf(commandstring, STRING_SIZE,
-                                       "/bin/wget -O - %s/%s | /bin/tar -C / -xvzf -",
-                                       url, string);
-                               if (runcommandwithprogress(60, 4, title, commandstring,
-                                       4500, ctr[TR_INSTALLING_FILES]))
-                               {
-                                       errorbox(ctr[TR_UNABLE_TO_INSTALL_FILES]);
-                                       goto EXIT;
-                               }
-                       }
-               } else
-                       fclose(handle);
-       } else {  /* cdrom/usb install, install SCSI id not done */
-               if (ide_cdrom) {
-                       if (runcommandwithstatus("/bin/tar -C / -xvzf /cdrom/images/scsidrv-"VERSION".img", ctr[TR_EXTRACTING_MODULES]))
-                       {
-                               errorbox(ctr[TR_UNABLE_TO_EXTRACT_MODULES]);
-                               goto EXIT;
+                               raid_disk = 1;
+                               sprintf(harddrive, "ida/c0d0");
                        }
-               }
-       }
-
-       /* load SCSI/pcmcia drivers if not done during CD detection */
-       if (!scsi_cdrom) {
-#if 0 /* not yet */
-               if (pcmcia)
-               {
-                       /* trying to support SCSI pcmcia :-) */
-                       runcommandwithstatus("cardmgr -o -c /etc/pcmcia/scsi", 
-                               ctr[TR_LOADING_PCMCIA]);
-                       if (try_scsi(usb_cdrom ? "sdb":"sda")) {
-                               scsi_disk = 1;
-                               pcmcia_disk = 1;
+               } else {
+                   if (strstr(sourcedrive, "sda") != NULL) {
+                       // probably installing from usb stick, try sdb
+                       if (try_scsi("sdb")) {
+                           sprintf(harddrive, "sdb");
                        }
-                       if (checkusb("sdb") && try_scsi("sdc")) {
-                               scsi_disk = 1;
-                               pcmcia_disk = 1;
+                       else {
+                           errorbox(ctr[TR_NO_HARDDISK]);
+                           goto EXIT;
                        }
+                   }
+                   else {
+                       sprintf(harddrive, "sda");
+                   }
                }
-#endif
-               /* 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]);
-       }
-       /* Now try to find destination device...        
-          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 is sdd or more, it is not discovered
-       */
-       if (try_scsi(usb_cdrom ? "sdb":"sda")) {
-               scsi_disk = 1;
-               sprintf(harddrive, usb_cdrom ? "sdb":"sda");
-               goto FOUND_DESTINATION;
-       }
-       if (checkusb("sdb") && try_scsi("sdc")) {
                scsi_disk = 1;
-               sprintf(harddrive, "sdc");
-               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;
+       } else
+               sprintf(harddrive, "hd%c", hdletter);
+
+       fprintf(flog, "Destination drive: %s\n", harddrive);
+
+       /* load unattended configuration */
+       if (unattended) {
+           fprintf(flog, "unattended: Reading unattended.conf\n");
+
+           (void) readkeyvalues(unattendedkv, UNATTENDED_CONF);
        }
-       if (try_scsi("ataraid/d0")) {
-               raid_disk = 1;
-               sprintf(harddrive, "ataraid/d0");
-               goto FOUND_DESTINATION;
+
+       /* Make the hdparms struct and print the contents. */
+       snprintf(hdparams.devnode, STRING_SIZE, "/dev/%s", harddrive);
+       hdparams.module = 0;
+
+       sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode);
+       
+       if (unattended) {
+           hardyn = 1;
        }
-       /* nothing worked, give up */
-       errorbox(ctr[TR_NO_HARDDISK]);
-       goto EXIT;
-
-       FOUND_DESTINATION:
-       /* Make the hdparms struct and print the contents.
-          With USB-KEY install and SCSI disk, while installing, the disk
-          is named 'sdb,sdc,...' (following keys)
-          On reboot, it will become 'sda'
-          To avoid many test, all names are built in the struct.
-       */
-       sprintf(hdparams.devnode_disk, "/dev/%s", harddrive);
-       /* Address the partition or raid partition (eg dev/sda or /dev/sdap1 */
-       sprintf(hdparams.devnode_part, "/dev/%s%s", harddrive,raid_disk ? "p" : "");
-       /* now the names after the machine is booted. Today 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" : "");
+       
+       while (! hardyn) {
+               rc = newtWinMenu(title, message,
+                                50, 5, 5, 6, yesnoharddisk,
+                                &hardyn, ctr[TR_OK],
+                                ctr[TR_CANCEL], NULL);
+               if (rc == 2)
+                       goto EXIT;
        }
 
-       rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL],
-               ctr[TR_PREPARE_HARDDISK], hdparams.devnode_disk_run);
-       if (rc != 1)
+       if (rc == 2)
                goto EXIT;
 
        /* Calculate amount of memory in machine */
@@ -685,162 +546,181 @@ int main(int argc, char *argv[])
                fclose(handle);
         }
        
-       fprintf(flog, "maximum_free = %d, memory = %d", maximum_free, memory);
+       fprintf(flog, "maximum_free = %ld, memory = %ld", 
+               maximum_free, memory);
        
-       /* If you need more than this, you should really add physical memory */
-       /* Minimum: 192 = 64 real + 128 swap */
-       swap_file = memory < 64 ? 2 * memory : 192 - memory ;
-       swap_file = swap_file < 32 ? 32 : swap_file ;
+       swap_file = calc_swapsize(memory, maximum_free);
 
-       if (maximum_free < 135 + swap_file )
-       {
-               if (maximum_free < 135) {
+       if (maximum_free < 512 + swap_file ) {
+               if (maximum_free < 512) {
                        errorbox(ctr[TR_DISK_TOO_SMALL]);
                        goto EXIT;
                }
 
-               rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
+               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 = 8; /* in MB */
+       boot_partition = 20; /* in MB */
        current_free = maximum_free - boot_partition - swap_file;
 
-       /* Give more place for add-on, extend root to 25% of current_free, upper limit to 8 gigas */
-       root_partition = current_free / 4 ;
-       root_partition = root_partition > 8192 ? 8192 : root_partition ;
-       root_partition = current_free < 860 ? 235 : root_partition;
-       root_partition = current_free < 380 ? 110 : root_partition;
+       root_partition = 2048 ;
+       if (current_free < 512) {
+               errorbox(ctr[TR_DISK_TOO_SMALL]);
+               goto EXIT;
+       }
 
        current_free = current_free - root_partition;
-       root_partition = root_partition + swap_file;
+       if (!swap_file) {
+               root_partition = root_partition + swap_file;
+       }
 
-       log_partition = current_free;
+       system_partition = current_free;
 
-       fprintf(flog, "boot = %d, swap = %d, mylog = %d, root = %d\n",
-               boot_partition, swap_file, log_partition, root_partition);
+       fprintf(flog, "boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
+               boot_partition, swap_file, system_partition, root_partition);
 
-#ifdef __alpha__
-       fdisk = 1;
-#endif
+       handle = fopen("/tmp/partitiontable", "w");
 
-       if (fdisk) {
-               rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], "NOW FDISK");
-               if (rc != 1)
-                       goto EXIT;
+       /* 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 {
-#ifdef __i386__
-               handle = fopen("/tmp/partitiontable", "w");
-
-               fprintf(handle, ",%d,83,*\n,%d,83,\n,0,0,\n,,83,\n",
-                       boot_partition, log_partition);
+               fprintf(handle, ",%ld,L,*\n,0,0,\n,%ld,L,\n,,L,\n",
+                       boot_partition, root_partition);
+       }
 
-               fclose(handle);         
+       fclose(handle);
 
-               sprintf(commandstring, "/bin/sfdisk -uM %s < /tmp/partitiontable", hdparams.devnode_disk);
-               if (runcommandwithstatus(commandstring, ctr[TR_PARTITIONING_DISK]))
-               {
-                       errorbox(ctr[TR_UNABLE_TO_PARTITION]);
-                       goto EXIT;
-               }
-#endif
+       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;
        }
-       /* create filesystem boot partition 1 */
-       sprintf(commandstring, "/bin/mke2fs -m 0 -j %s1", hdparams.devnode_part);
+
+       mysystem("/sbin/udevstart");
+
+       if (raid_disk)
+               snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %sp1", hdparams.devnode);
+       else
+               snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %s1", hdparams.devnode);
        if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM]))
        {
                errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]);
                goto EXIT;
        }
 
-       /* create filesystem log partition 2 */
-       sprintf(commandstring, "/bin/mke2fs -j %s2", hdparams.devnode_part);
-       if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
+       if (swap_file) {
+               if (raid_disk)
+                       snprintf(commandstring, STRING_SIZE, "/sbin/mkswap %sp2", hdparams.devnode);    
+               else
+                       snprintf(commandstring, STRING_SIZE, "/sbin/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/mkreiserfs -f %sp3", hdparams.devnode);      
+       else
+               snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %s3", hdparams.devnode);       
+
+       if (runcommandwithstatus(commandstring, ctr[TR_MAKING_ROOT_FILESYSTEM]))
        {
-               errorbox(ctr[TR_UNABLE_TO_MAKE_LOG_FILESYSTEM]);
+               errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
                goto EXIT;
        }
 
-       /* create filesystem root partition 4 */
-       sprintf(commandstring, "/bin/mke2fs -m 1 -j %s4", hdparams.devnode_part);
-       if (runcommandwithstatus(commandstring, ctr[TR_MAKING_ROOT_FILESYSTEM]))
+       if (raid_disk)
+               snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %sp4", hdparams.devnode);      
+       else
+               snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %s4", hdparams.devnode);       
+
+       if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
        {
                errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
                goto EXIT;
        }
 
-       /* Mount root on partition 4 */
-       sprintf(commandstring, "/sbin/mount -t ext2 %s4 /harddisk", hdparams.devnode_part);
+       /* Mount harddisk. */
+       if (raid_disk)
+               snprintf(commandstring, STRING_SIZE, "/bin/mount %sp3 /harddisk", hdparams.devnode);
+       else
+               snprintf(commandstring, STRING_SIZE, "/bin/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", S_IRWXU|S_IRWXG|S_IRWXO);
        mkdir("/harddisk/var/log", S_IRWXU|S_IRWXG|S_IRWXO);
+       
+       if (raid_disk)
+               snprintf(commandstring, STRING_SIZE, "/bin/mount %sp1 /harddisk/boot", hdparams.devnode);
+       else
+               snprintf(commandstring, STRING_SIZE, "/bin/mount %s1 /harddisk/boot", hdparams.devnode);
 
-       /* Make,mount swapfile */
+       if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_BOOT_FILESYSTEM]))
+       {
+               errorbox(ctr[TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM]);
+               goto EXIT;
+       }
        if (swap_file) {
-               sprintf(commandstring, "/bin/dd if=/dev/zero of=/harddisk/swapfile bs=1024k count=%d", swap_file);
-               if (runcommandwithstatus(commandstring, ctr[TR_MAKING_SWAPSPACE]))
-               {
-                       errorbox(ctr[TR_UNABLE_TO_MAKE_SWAPSPACE]);
-                       goto EXIT;
-               }
-               if (runcommandwithstatus("/bin/mkswap /harddisk/swapfile", ctr[TR_MAKING_SWAPSPACE]))
-               {
-                       errorbox(ctr[TR_UNABLE_TO_MAKE_SWAPSPACE]);
-                       goto EXIT;
-               }
-               if (runcommandwithstatus("/bin/swapon /harddisk/swapfile", ctr[TR_MOUNTING_SWAP_PARTITION]))
+               if (raid_disk)
+                       snprintf(commandstring, STRING_SIZE, "/sbin/swapon %sp2", hdparams.devnode);
+               else
+                       snprintf(commandstring, STRING_SIZE, "/sbin/swapon %s2", hdparams.devnode);
+               if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_SWAP_PARTITION]))
                {
                        errorbox(ctr[TR_UNABLE_TO_MOUNT_SWAP_PARTITION]);
                        goto EXIT;
                }
        }
-
-       /* Mount boot on partition 1 */
-       sprintf(commandstring, "/sbin/mount -t ext2 %s1 /harddisk/boot", hdparams.devnode_part);
-       if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_BOOT_FILESYSTEM]))
-       {
-               errorbox(ctr[TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM]);
-               goto EXIT;
-       }
-
-       /* Mount log on partition 2 */
-       sprintf(commandstring, "/sbin/mount -t ext2 %s2 /harddisk/var/log", hdparams.devnode_part);
+       if (raid_disk)
+               snprintf(commandstring, STRING_SIZE, "/bin/mount %sp4 /harddisk/var", hdparams.devnode);
+       else
+               snprintf(commandstring, STRING_SIZE, "/bin/mount %s4 /harddisk/var", hdparams.devnode);
        if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_LOG_FILESYSTEM]))
        {
                errorbox(ctr[TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM]);
                goto EXIT;
        }
        
-       /* Either use tarball from cdrom or download. */
-       if (installtype == CDROM_INSTALL)
-               snprintf(commandstring, STRING_SIZE, 
-                       "/bin/tar -C /harddisk -xvzf /cdrom/" SNAME "-" VERSION ".tgz");
-       else
-               snprintf(commandstring, STRING_SIZE, 
-                       "/bin/wget -O - %s/" SNAME "-" VERSION ".tgz | /bin/tar -C /harddisk -xvzf -", url);
+       snprintf(commandstring, STRING_SIZE, "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
        
-       if (runcommandwithprogress(60, 4, title, commandstring, 4600,
+       if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
                ctr[TR_INSTALLING_FILES]))
        {
                errorbox(ctr[TR_UNABLE_TO_INSTALL_FILES]);
                goto EXIT;
        }
-       
+               
        /* Save USB controller type to modules.conf */
        write_usb_modules_conf();
 
        /* touch the modules.dep files */
-       mysystem("/bin/chroot /harddisk /bin/touch /lib/modules/"KERNEL_VERSION"/modules.dep");
-#ifdef __i386__
-       mysystem("/bin/chroot /harddisk /bin/touch /lib/modules/"KERNEL_VERSION"-smp/modules.dep");
-#endif
+       snprintf(commandstring, STRING_SIZE, 
+               "/sbin/chroot /harddisk /usr/bin/touch /lib/modules/%s/modules.dep",
+               KERNEL_VERSION);
+       mysystem(commandstring);
+       snprintf(commandstring, STRING_SIZE, 
+               "/sbin/chroot /harddisk /usr/bin/touch /lib/modules/%s-smp/modules.dep",
+               KERNEL_VERSION);
+       mysystem(commandstring);
 
        /* Rename uname */
        rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
@@ -871,181 +751,119 @@ int main(int argc, char *argv[])
 
        /* *always* write disk configuration */
        if (!(write_disk_configs(&hdparams))){
-               errorbox(ctr[TR_ERROR_WRITING_CONFIG]);
-               goto EXIT;
+         errorbox(ctr[TR_ERROR_WRITING_CONFIG]);
+         goto EXIT;
        }
 
-       /*  
-         Allow the user to restore their configuration from a floppy.
-         It uses tar.  If the tar fails for any reason, show user an
-         error and go back to the restore/skip question. This gives
-         the user the chance to have another go. */
-         
-       /* Program is outside install to save space on floppy 
-       */
-       fprintf(flog, "Passing control to install2.\n");        
-       fflush(flog);
-       //newtSuspend();
-       /* pass needed parameter for install 2 by position
-           choice: index of langage selected
-           devnode_disk: to prevent unmounting of it
-           url: if network, allow restaure from it
-       */
-       sprintf(commandstring, "/harddisk/usr/local/bin/install2 %d %s %s",
-               choice,
-               strlen(cdromparams.devnode_disk ) ? cdromparams.devnode_disk : "none",
-               strlen(url) ? url : "none"
-              );
-       no_restore = system(commandstring);
-       //newtResume();
-       
-       /*  if we installed from CD ROM then we didn't set up the
-           network interface yet.  Therefore, set up Network
-           driver and params just before we need them.
-       */
-       if (no_restore && (installtype == CDROM_INSTALL)) {  
-               if (!(networkmenu(ethernetkv))){
-                       errorbox(ctr[TR_NETWORK_SETUP_FAILED]);
-                       goto EXIT;
-               }
-       }
+       /* mount proc filesystem */
+       mysystem("mkdir /harddisk/proc");
+       mysystem("/bin/mount -t proc none /harddisk/proc");
+       mysystem("/bin/mount --bind /dev /harddisk/dev");
 
-       /* Build cache lang file */
-       mysystem("/bin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
-       
-       /* write ethernet and lang configs only if they have not
-           been restored from floppy already. */
-       if (no_restore) {
-               if (!write_ethernet_configs(ethernetkv)||
-                   !write_lang_configs(shortlangname))  {
-                       errorbox(ctr[TR_ERROR_WRITING_CONFIG]);
-                       goto EXIT;
-               }
-       }
 
 
-#if 0 /* not yet */
-       if (pcmcia_disk)
+       /* if we detected SCSI then fixup */
+       /* doesn't really work cause it sometimes creates a ramdisk on ide systems */
+/*     mysystem("/bin/probecntrl.sh");
+       if ((handle = fopen("/cntrldriver", "r")))
        {
-               fprintf(flog, "Detected SCSI driver PCMCIA\n");
-               fprintf(flog, "Fixing up ipcoprd.img\n");
-               mysystem("/bin/chroot /harddisk /sbin/modprobe loop");
-               mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
-               mysystem("/bin/chroot /harddisk /sbin/pcinitrd -r "KERNEL_VERSION" /boot/ipcoprd.img");
-#ifdef __i386__
-               mysystem("/bin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
-#endif
-#ifdef __alpha__
-               mysystem("/bin/chroot /harddisk /bin/mv /boot/etc/scsiaboot.conf /boot/etc/aboot.conf");
-#endif
-       }
-#endif
+               char *driver;
+                       fgets(line, STRING_SIZE-1, handle);
+                       fclose(handle);
+               line[strlen(line) - 1] = 0;
+               driver = strtok(line, ".");
+               fprintf(flog, "Detected SCSI driver %s\n",driver);
+               if (strlen(driver) > 1) {
+                       fprintf(flog, "Fixing up ipfirerd.img\n");
+                       mysystem("/sbin/chroot /harddisk /sbin/modprobe loop");
+                       mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
+                       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd.img %s", driver, KERNEL_VERSION);
+                       runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+                       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd-smp.img %s-smp", driver, KERNEL_VERSION);
+                       runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+                       mysystem("/sbin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
+               }
+       } */
 
-#ifdef __i386__
-       // to verify: with USB-key grubbatch install on sdb and boot sda....
-       replace( "/harddisk/boot/grub/grubbatch", "DEVICE", hdparams.devnode_disk);
-       /* restore permissions */
-       chmod("/harddisk/boot/grub/grubbatch", S_IXUSR | S_IRUSR | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH);
+       /* Build cache lang file */
+       snprintf(commandstring, STRING_SIZE, "/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]);
+               goto EXIT;
+       }
 
-       sprintf(string, "root=%s4", hdparams.devnode_part_run);
+       if (raid_disk)
+               sprintf(string, "root=%sp3", hdparams.devnode);
+       else
+               sprintf(string, "root=%s3", hdparams.devnode);
        replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
+       mysystem( "sed -i \"s|KVERSION|$(/bin/uname -r)|\" /harddisk/boot/grub/grub.conf" );
 
-       mysystem("/bin/chroot /harddisk /bin/mount -n -t proc none /proc");
+       replace( "/harddisk/boot/grub/grubbatch", "DEVICE", hdparams.devnode);
+       /* restore permissions */
+       chmod("/harddisk/boot/grub/grubbatch", S_IXUSR | S_IRUSR | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH);
 
-       if (runcommandwithstatus("/bin/chroot /harddisk /boot/grub/grubbatch", ctr[TR_INSTALLING_GRUB]))
-       {
+       snprintf(commandstring, STRING_SIZE, 
+                "/sbin/chroot /harddisk /boot/grub/grubbatch");
+       if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) {
                errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
                goto EXIT;
        }
-       mysystem("/bin/chroot /harddisk /bin/umount -n /proc");
-#endif
-#ifdef __alpha__
-       sprintf(commandstring, "/bin/chroot /harddisk /sbin/swriteboot -f3 %s /boot/bootlx", hdparams.devnode_disk);
-       mysystem(commandstring);
-       sprintf(commandstring, "/bin/chroot /harddisk /sbin/abootconf %s 1", hdparams.devnode_disk_run);
-       mysystem(commandstring);
-       sprintf(string, "root=%s4", hdparams.devnode_part_run);
-       replace( "/harddisk/boot/etc/aboot.conf", "root=ROOT", string);
-#endif
-
-       /* unmounting happens everywhere because there are places
-          which require device is to be unmounted under certain
-          circumstances.  This is the last place we can unmount
-          anything and still succeed.
-       */
-
-       if (!unmount_before && !usb_cdrom && installtype == CDROM_INSTALL){
-               if (mysystem("/sbin/umount /cdrom"))
-               {
-                       errorbox(ctr[TR_UNABLE_TO_UNMOUNT_CDROM]);
-                       goto EXIT;
-               }
-       }
 
-       if ((installtype == CDROM_INSTALL) && !usb_cdrom)
-       {
-               if (!(ejectcdrom(cdromparams.devnode_disk)))
-               {
-                       errorbox(ctr[TR_UNABLE_TO_EJECT_CDROM]);
-                       // goto EXIT;
-               }
-       }
+       /* Update /etc/fstab */
+       replace( "/harddisk/etc/fstab", "DEVICE", hdparams.devnode);
 
-       snprintf(message, STRING_SIZE, ctr[TR_CONGRATULATIONS_LONG],
-               NAME, SNAME, SNAME, NAME, NAME, NAME);
-       newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
-       
+       /* Install bootsplash */
+       mysystem("/bin/installbootsplash.sh");
+
+       mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
+       mysystem("umount /harddisk/proc");
+       mysystem("umount /harddisk/dev");
+
+       if (!unattended) {
+               sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
+                               NAME, SNAME, SNAME, NAME, NAME, NAME);
+               newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
+       }
+                
        allok = 1;
 
 EXIT:
-       fprintf(flog, "Install program ended.\n");
+       fprintf(flog, "Install program ended.\n");      
        fflush(flog);
        fclose(flog);
 
-       if (!allok)
+       if (!(allok))
                newtWinMessage(title, ctr[TR_OK], ctr[TR_PRESS_OK_TO_REBOOT]);  
-
+       
        newtFinished();
-
+       
        freekeyvalues(ethernetkv);
-       //no more needed
-       mysystem("/bin/chroot /harddisk /bin/rm /usr/local/bin/install2");
 
-       /* run setup only if config not restored from floppy already. */
-       if (allok && no_restore)
+       if (allok && !allok_fastexit)
        {
                /* /proc is needed by the module checker.  We have to mount it
                 * so it can be seen by setup, which is run chrooted. */
-               if (system("/sbin/mount proc -t proc /harddisk/proc"))
+               if (system("/bin/mount proc -t proc /harddisk/proc"))
                        printf("Unable to mount proc in /harddisk.");
                else
                {
-                       if (system("/bin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
+                       if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
                                printf("Unable to run setup.\n");
-                       if (system("/sbin/umount /harddisk/proc"))
+                       if (system("/bin/umount /harddisk/proc"))
                                printf("Unable to umount /harddisk/proc.\n");
                }
        }
 
        fcloseall();
 
-       system("/bin/swapoff /harddisk/swapfile");
-       system("/sbin/umount /harddisk/var/log");
-       system("/sbin/umount /harddisk/boot");
-       system("/sbin/umount /harddisk");
+       system("/sbin/swapoff /harddisk/swapfile");
+       system("/bin/umount /harddisk/var");
+       system("/bin/umount /harddisk/boot");
+       system("/bin/umount /harddisk");
+         
        system("/etc/halt");
 
        return 0;
 }
-
-int modprobe (char *mod) {
-    char commandstring[STRING_SIZE];
-    sprintf (commandstring,"/sbin/modprobe %s", mod);
-    return mysystem (commandstring);    
-}
-
-int rmmod (char *mod) {
-    char commandstring[STRING_SIZE];
-    sprintf (commandstring,"/sbin/rmmod %s", mod);
-    return mysystem (commandstring);    
-}