]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/install+setup/install/main.c
installer: Fix umounting and ejecting cdrom after install.
[people/pmueller/ipfire-2.x.git] / src / install+setup / install / main.c
index 8525e535502764e2e78b187a25b5ea2c56031333..56b9446db73edd44426fabcce8ce7b2f170f6c97 100644 (file)
@@ -9,18 +9,21 @@
  * 
  */
 
-#include "install.h"
 #define _GNU_SOURCE
+
+#include <assert.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mount.h>
+
+#include "hw.h"
+#include "install.h"
  
-#define INST_FILECOUNT 14400
+#define INST_FILECOUNT 21000
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 #define LICENSE_FILE   "/cdrom/COPYING"
 
-#define EXT2 0
-#define EXT3 1
-#define EXT4 2
-#define REISERFS 3
-
 FILE *flog = NULL;
 char *mylog;
 
@@ -40,53 +43,134 @@ extern char *pl_tr[];
 extern char *ru_tr[];
 extern char *tr_tr[];
 
-int main(int argc, char *argv[])
-{
+static int newtChecklist(const char* title, const char* message,
+               unsigned int width, unsigned int height, unsigned int num_entries,
+               const char** entries, int* states) {
+       int ret;
+       const int list_height = 4;
+
+       char cbstates[num_entries];
+
+       for (unsigned int i = 0; i < num_entries; i++) {
+               cbstates[i] = states[i] ? '*' : ' ';
+       }
+
+       newtCenteredWindow(width, height, title);
+
+       newtComponent textbox = newtTextbox(1, 1, width - 2, height - 6 - list_height,
+               NEWT_FLAG_WRAP);
+       newtTextboxSetText(textbox, message);
+
+       int top = newtTextboxGetNumLines(textbox) + 2;
+
+       newtComponent form = newtForm(NULL, NULL, 0);
+
+       newtComponent sb = NULL;
+       if (list_height < num_entries) {
+               sb = newtVerticalScrollbar(
+                       width - 4, top + 1, list_height,
+                       NEWT_COLORSET_CHECKBOX, NEWT_COLORSET_ACTCHECKBOX);
+
+               newtFormAddComponent(form, sb);
+       }
+
+       newtComponent subform = newtForm(sb, NULL, 0);
+       newtFormSetBackground(subform, NEWT_COLORSET_CHECKBOX);
+
+       newtFormSetHeight(subform, list_height);
+       newtFormSetWidth(subform, width - 10);
+
+       for (unsigned int i = 0; i < num_entries; i++) {
+               newtComponent cb = newtCheckbox(4, top + i, entries[i], cbstates[i],
+                       NULL, &cbstates[i]);
+
+               newtFormAddComponent(subform, cb);
+       }
+
+       newtFormAddComponents(form, textbox, subform, NULL);
+
+       newtComponent btn_okay   = newtButton((width - 18) / 3, height - 4, ctr[TR_OK]);
+       newtComponent btn_cancel = newtButton((width - 18) / 3 * 2 + 9, height - 4, ctr[TR_CANCEL]);
+       newtFormAddComponents(form, btn_okay, btn_cancel, NULL);
+
+       newtComponent answer = newtRunForm(form);
+
+       if ((answer == NULL) || (answer == btn_cancel)) {
+               ret = -1;
+       } else {
+               ret = 0;
+
+               for (unsigned int i = 0; i < num_entries; i++) {
+                       states[i] = (cbstates[i] != ' ');
+
+                       if (states[i])
+                               ret++;
+               }
+       }
+
+       newtFormDestroy(form);
+       newtPopWindow();
+
+       return ret;
+}
+
+static int newtWinOkCancel(const char* title, const char* message, int width, int height,
+               const char* btn_txt_ok, const char* btn_txt_cancel) {
+       int ret = 1;
+
+       newtCenteredWindow(width, height, title);
+
+       newtComponent form = newtForm(NULL, NULL, 0);
+
+       newtComponent textbox = newtTextbox(1, 1, width - 2, height - 6, NEWT_FLAG_WRAP);
+       newtTextboxSetText(textbox, message);
+       newtFormAddComponent(form, textbox);
+
+       newtComponent btn_ok = newtButton((width - 16) / 3, height - 4, btn_txt_ok);
+       newtComponent btn_cancel = newtButton((width - 16) / 3 * 2 + 9, height - 4,
+               btn_txt_cancel);
+
+       newtFormAddComponents(form, btn_ok, btn_cancel, NULL);
+
+       newtComponent answer = newtRunForm(form);
+
+       if (answer == btn_ok) {
+               ret = 0;
+       }
+
+       newtFormDestroy(form);
+       newtPopWindow();
+
+       return ret;
+}
+
+int main(int argc, char *argv[]) {
+       struct hw* hw = hw_init();
 
        char discl_msg[40000] = "Disclaimer\n";
 
        char *langnames[] = { "Deutsch", "English", "Français", "Español", "Nederlands", "Polski", "Русский", "Türkçe", NULL };
        char *shortlangnames[] = { "de", "en", "fr", "es", "nl", "pl", "ru", "tr", NULL };
        char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, nl_tr, pl_tr, ru_tr, tr_tr, NULL };
-       char hdletter;
-       char harddrive[30], sourcedrive[5];     /* Device holder. */
-       char harddrive_info[STRING_SIZE];       /* Additional infos about target */
-       struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
+       char* sourcedrive = NULL;
        int rc = 0;
        char commandstring[STRING_SIZE];
-       char mkfscommand[STRING_SIZE];
-       char *fstypes[] = { "ext2", "ext3", "ext4", "ReiserFS", NULL };
-       int fstype = EXT4;
        int choice;
-       int i;
-       int found = 0;
        char shortlangname[10];
-       char message[1000];
+       char message[STRING_SIZE];
        char title[STRING_SIZE];
        int allok = 0;
-       int allok_fastexit=0;
-       int raid_disk = 0;
-       struct keyvalue *ethernetkv = initkeyvalues();
        FILE *handle, *cmdfile, *copying;
        char line[STRING_SIZE];
-       char string[STRING_SIZE];
-       long memory = 0, disk = 0, free;
-       long system_partition, boot_partition, root_partition, swap_file;
-       int scsi_disk = 0;
-       char *yesnoharddisk[3]; //      char *yesnoharddisk = { "NO", "YES", NULL };
                
        int unattended = 0;
        int serialconsole = 0;
        struct keyvalue *unattendedkv = initkeyvalues();
-       int hardyn = 0;
        char restore_file[STRING_SIZE] = "";
 
        setlocale (LC_ALL, "");
        sethostname( SNAME , 10);
 
-       memset(&hdparams, 0, sizeof(struct devparams));
-       memset(&cdromparams, 0, sizeof(struct devparams));
-
        /* Log file/terminal stuff. */
        if (argc >= 2)
        {               
@@ -124,8 +208,6 @@ int main(int argc, char *argv[])
        }
 
        // Load common modules
-       mysystem("/sbin/modprobe iso9660"); // CDROM
-//     mysystem("/sbin/modprobe ext2"); // Boot patition
        mysystem("/sbin/modprobe vfat"); // USB key
        
        /* German is the default */
@@ -152,20 +234,39 @@ int main(int argc, char *argv[])
                newtWinMessage(title, ctr[TR_OK], message);
        }
 
-       mysystem("/bin/mountsource.sh");
+       /* Search for a source drive that holds the right
+        * version of the image we are going to install. */
+       sourcedrive = hw_find_source_medium(hw);
 
-       if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
+       fprintf(flog, "Source drive: %s\n", sourcedrive);
+       if (!sourcedrive) {
                newtWinMessage(title, ctr[TR_OK], ctr[TR_NO_LOCAL_SOURCE]);
-               runcommandwithstatus("/bin/downloadsource.sh",ctr[TR_DOWNLOADING_ISO]);
+               runcommandwithstatus("/bin/downloadsource.sh", ctr[TR_DOWNLOADING_ISO]);
                if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
                        errorbox(ctr[TR_DOWNLOAD_ERROR]);
                        goto EXIT;
                }
+
+               fgets(sourcedrive, 5, handle);
+               fclose(handle);
        }
 
-       fgets(sourcedrive, 5, handle);
-       fprintf(flog, "Source drive: %s\n", sourcedrive);
-       fclose(handle);
+       assert(sourcedrive);
+
+       int r = hw_mount(sourcedrive, SOURCE_MOUNT_PATH, "iso9660", MS_RDONLY);
+       if (r) {
+               fprintf(flog, "Could not mount %s to %s\n", sourcedrive, SOURCE_MOUNT_PATH);
+               fprintf(flog, strerror(errno));
+               exit(1);
+       }
+
+       /* load unattended configuration */
+       if (unattended) {
+           fprintf(flog, "unattended: Reading unattended.conf\n");
+
+           (void) readkeyvalues(unattendedkv, UNATTENDED_CONF);
+           findkey(unattendedkv, "RESTORE_FILE", restore_file);
+       }
 
        if (!unattended) {
                // Read the license file.
@@ -183,278 +284,174 @@ int main(int argc, char *argv[])
                }
        }
 
-       i = 0;
-       while (found == 0) {
-               i++;
-               fprintf(flog, "Harddisk scan pass %i\n", i);
+       int part_type = HW_PART_TYPE_NORMAL;
 
-               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;
+       // Scan for disks to install on.
+       struct hw_disk** disks = hw_find_disks(hw);
+
+       struct hw_disk** selected_disks = NULL;
+       unsigned int num_selected_disks = 0;
+
+       // Check how many disks have been found and what
+       // we can do with them.
+       unsigned int num_disks = hw_count_disks(disks);
+
+       while (1) {
+               // no harddisks found
+               if (num_disks == 0) {
+                       errorbox(ctr[TR_NO_HARDDISK]);
+                       goto EXIT;
+
+               // exactly one disk has been found
+               } else if (num_disks == 1) {
+                       selected_disks = hw_select_disks(disks, NULL);
+
+               // more than one usable disk has been found and
+               // the user needs to choose what to do with them
+               } else {
+                       const char* disk_names[num_disks];
+                       int disk_selection[num_disks];
+
+                       for (unsigned int i = 0; i < num_disks; i++) {
+                               disk_names[i] = &disks[i]->description;
+                               disk_selection[i] = 0;
+                       }
+
+                       while (!selected_disks) {
+                               rc = newtChecklist(ctr[TR_DISK_SELECTION], ctr[TR_DISK_SELECTION_MSG],
+                                       50, 20, num_disks, disk_names, disk_selection);
+
+                               // Error
+                               if (rc < 0) {
+                                       goto EXIT;
+
+                               // Nothing has been selected
+                               } else if (rc == 0) {
+                                       errorbox(ctr[TR_NO_DISK_SELECTED]);
+
+                               } else {
+                                       selected_disks = hw_select_disks(disks, disk_selection);
+                               }
+                       }
+               }
+
+               num_selected_disks = hw_count_disks(selected_disks);
+
+               if (num_selected_disks == 1) {
+                       snprintf(message, sizeof(message), ctr[TR_DISK_SETUP_DESC], (*selected_disks)->description);
+                       rc = newtWinOkCancel(ctr[TR_DISK_SETUP], message, 50, 10,
+                               ctr[TR_DELETE_ALL_DATA], ctr[TR_CANCEL]);
+
+                       if (rc == 0)
                                break;
-                       case 2: // Found RAID disk
-                               scsi_disk = 0;
-                               raid_disk= 1;
-                               found = 1;
+
+               } else if (num_selected_disks == 2) {
+                       snprintf(message, sizeof(message), ctr[TR_RAID_SETUP_DESC],
+                               (*selected_disks)->description, (*selected_disks + 1)->description);
+                       rc = newtWinOkCancel(ctr[TR_RAID_SETUP], message, 50, 10,
+                               ctr[TR_DELETE_ALL_DATA], ctr[TR_CANCEL]);
+
+                       if (rc == 0) {
+                               part_type = HW_PART_TYPE_RAID1;
+
                                break;
-                       case 10: // No harddisk found
-                               errorbox(ctr[TR_NO_HARDDISK]);
-                               goto EXIT;
+                       }
+
+               // Currently not supported
+               } else {
+                       errorbox(ctr[TR_DISK_CONFIGURATION_NOT_SUPPORTED]);
+               }
+
+               if (selected_disks) {
+                       hw_free_disks(selected_disks);
+                       selected_disks = NULL;
                }
        }
 
-       if ((handle = fopen("/tmp/dest_device", "r")) == NULL) {
-               errorbox(ctr[TR_NO_HARDDISK]);
+       hw_free_disks(disks);
+
+       struct hw_destination* destination = hw_make_destination(part_type, selected_disks);
+
+       if (!destination) {
+               errorbox(ctr[TR_DISK_TOO_SMALL]);
                goto EXIT;
        }
-       fgets(harddrive, 30, handle);
-       fclose(handle);
-       if ((handle = fopen("/tmp/dest_device_info", "r")) == NULL) {
-               sprintf(harddrive_info, "%s", harddrive);
-       }
-       fgets(harddrive_info, 70, handle);
-       fclose(handle);
 
-                       
-       /* load unattended configuration */
-       if (unattended) {
-           fprintf(flog, "unattended: Reading unattended.conf\n");
+       fprintf(flog, "Destination drive: %s\n", destination->path);
+       fprintf(flog, "  boot: %s (%lluMB)\n", destination->part_boot, BYTES2MB(destination->size_boot));
+       fprintf(flog, "  swap: %s (%lluMB)\n", destination->part_swap, BYTES2MB(destination->size_swap));
+       fprintf(flog, "  root: %s (%lluMB)\n", destination->part_root, BYTES2MB(destination->size_root));
+       fprintf(flog, "  data: %s (%lluMB)\n", destination->part_data, BYTES2MB(destination->size_data));
 
-           (void) readkeyvalues(unattendedkv, UNATTENDED_CONF);
-           findkey(unattendedkv, "RESTORE_FILE", restore_file);            
-       }
-       
-       /* 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. Only scsi is affected
-          and we only install on the first scsi disk. */
-
-       fprintf(flog, "Destination drive: %s\n", hdparams.devnode_disk);
-       
-       sprintf(message, ctr[TR_PREPARE_HARDDISK], harddrive_info);
-       if (unattended) {
-           hardyn = 1;
-       } else {
-               yesnoharddisk[0] = ctr[TR_NO];
-               yesnoharddisk[1] = ctr[TR_YES];
-               yesnoharddisk[2] = NULL;
-       }
+       // Warn the user if there is not enough space to create a swap partition
+       if (!unattended && !*destination->part_swap) {
+               rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
 
-       while (! hardyn) {
-               rc = newtWinMenu(title, message,
-                                50, 5, 5, 6, yesnoharddisk,
-                                &hardyn, ctr[TR_OK],
-                                ctr[TR_CANCEL], NULL);
-               if (rc == 2)
+               if (rc != 1)
                        goto EXIT;
        }
-       if (rc == 2)
-               goto EXIT;
-
-       fstypes[0]=ctr[TR_EXT2FS_DESCR];
-       fstypes[1]=ctr[TR_EXT3FS_DESCR];
-       fstypes[2]=ctr[TR_EXT4FS_DESCR];
-       fstypes[3]=ctr[TR_REISERFS_DESCR];
-       fstypes[4]=NULL;
-
-       if (!unattended) {              
-               sprintf(message, ctr[TR_CHOOSE_FILESYSTEM]);
-               rc = newtWinMenu( ctr[TR_CHOOSE_FILESYSTEM], message,
-                       50, 5, 5, 6, fstypes, &fstype, ctr[TR_OK],
-                       ctr[TR_CANCEL], NULL);
-       } else {
-           rc = 1;
-           fstype = EXT4;
-       }
-       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, "/sbin/sfdisk -s /dev/%s > /tmp/disksize 2> /dev/null", harddrive);
-       system(commandstring);
 
-       /* Calculate amount of disk space */
-       if ((handle = fopen("/tmp/disksize", "r"))) {
-               fgets(line, STRING_SIZE-1, handle);
-               if (sscanf (line, "%s", string)) {
-                       disk = atoi(string) / 1024;
+       // Filesystem selection
+       if (!unattended) {
+               struct filesystems {
+                       int fstype;
+                       const char* description;
+               } filesystems[] = {
+                       { HW_FS_EXT4,            ctr[TR_EXT4FS] },
+                       { HW_FS_EXT4_WO_JOURNAL, ctr[TR_EXT4FS_WO_JOURNAL] },
+                       { HW_FS_REISERFS,        ctr[TR_REISERFS] },
+                       { 0, NULL },
+               };
+               unsigned int num_filesystems = sizeof(filesystems) / sizeof(*filesystems);
+
+               char* fs_names[num_filesystems];
+               int fs_choice = 0;
+               for (unsigned int i = 0; i < num_filesystems; i++) {
+                       if (HW_FS_DEFAULT == filesystems[i].fstype)
+                               fs_choice = i;
+
+                       fs_names[i] = filesystems[i].description;
                }
-               fclose(handle);
-       }
-       
-       fprintf(flog, "Disksize = %ld, memory = %ld", disk, memory);
-       
-        /* Calculating Swap-Size dependend of Ram Size */
-       if (memory <= 256)
-               swap_file = 128;
-       else if (memory <= 1024 && memory > 256)
-               swap_file = 256;
-       else 
-               swap_file = memory / 4;
-       
-  /* Calculating Root-Size dependend of Max Disk Space */
-  if ( disk < 756 )
-               root_partition = 200;
-       else if ( disk >= 756 && disk <= 3072 )
-               root_partition = 512;
-       else 
-               root_partition = 2048;
-               
-       
-  /* Calculating the amount of free space */
-       boot_partition = 64; /* in MB */
-       system_partition = disk - ( root_partition + swap_file + boot_partition );
-       
-       fprintf(flog, ", boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
-       boot_partition, swap_file, system_partition, root_partition);
-       rc = 0;
-
-       if ( (!unattended) && (((disk - (root_partition + swap_file + boot_partition)) < 256 ) && ((disk - (root_partition + boot_partition )) > 256)) ) {
-   rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
-    if (rc == 1){
-      swap_file = 0;
-      system_partition = disk - ( root_partition + swap_file + boot_partition );
-      fprintf(flog, "Changing Swap Size to 0 MB.\n");
-    }
-    else if (rc == 2){
-    fprintf(flog, "Disk is too small.\n");
-    errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT;
-    }
-  } 
-  else if (disk - (root_partition + swap_file + boot_partition) >= 256) {
-  
-  }
-  else {
-   fprintf(flog, "Disk is too small.\n");
-   errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT;
-  }
-        
-       handle = fopen("/tmp/partitiontable", "w");
-
-       /* Make swapfile */
-  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, "/sbin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk);
-       if (runcommandwithstatus(commandstring, ctr[TR_PARTITIONING_DISK]))
-       {
-               errorbox(ctr[TR_UNABLE_TO_PARTITION]);
-               goto EXIT;
-       }
 
-       if (fstype == EXT2) {
-//             mysystem("/sbin/modprobe ext2");
-               sprintf(mkfscommand, "/sbin/mke2fs -T ext2");
-       } 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");
-       } else if (fstype == EXT4) {
-//             mysystem("/sbin/modprobe ext4");
-               sprintf(mkfscommand, "/sbin/mke2fs -T ext4");
-       }
+               rc = newtWinMenu(ctr[TR_CHOOSE_FILESYSTEM], ctr[TR_CHOOSE_FILESYSTEM],
+                       50, 5, 5, 6, fs_names, &fs_choice, ctr[TR_OK], ctr[TR_CANCEL], NULL);
 
-       snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -I 128 %s1", hdparams.devnode_part);
-       if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM]))
-       {
-               errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]);
-               goto EXIT;
-       }
+               if (rc == 0)
+                       destination->filesystem = filesystems[fs_choice].fstype;
 
-       if (swap_file) {
-               snprintf(commandstring, STRING_SIZE, "/sbin/mkswap %s2", hdparams.devnode_part);
-               if (runcommandwithstatus(commandstring, ctr[TR_MAKING_SWAPSPACE]))
-               {
-                       errorbox(ctr[TR_UNABLE_TO_MAKE_SWAPSPACE]);
+               else
                        goto EXIT;
-               }
        }
 
-       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;
-       }
+       // Execute the partitioning...
+       statuswindow(60, 4, title, ctr[TR_PARTITIONING_DISK]);
 
-       snprintf(commandstring, STRING_SIZE, "%s %s4", mkfscommand, hdparams.devnode_part);     
-       if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
-       {
-               errorbox(ctr[TR_UNABLE_TO_MAKE_LOG_FILESYSTEM]);
+       rc = hw_create_partitions(destination);
+       if (rc) {
+               errorbox(ctr[TR_UNABLE_TO_PARTITION]);
                goto EXIT;
        }
 
-       snprintf(commandstring, STRING_SIZE, "/bin/mount %s3 /harddisk", hdparams.devnode_part);
-       if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_ROOT_FILESYSTEM]))
-       {
-               errorbox(ctr[TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM]);
-               goto EXIT;
-       }
+       newtPopWindow();
 
-       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);
-       
-       snprintf(commandstring, STRING_SIZE, "/bin/mount %s1 /harddisk/boot", hdparams.devnode_part);
-       if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_BOOT_FILESYSTEM]))
-       {
-               errorbox(ctr[TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM]);
+       // Execute the formatting...
+       statuswindow(60, 4, title, ctr[TR_CREATING_FILESYSTEMS]);
+
+       rc = hw_create_filesystems(destination);
+       if (rc) {
+               errorbox(ctr[TR_UNABLE_TO_CREATE_FILESYSTEMS]);
                goto EXIT;
        }
-       if (swap_file) {
-               snprintf(commandstring, STRING_SIZE, "/sbin/swapon %s2", hdparams.devnode_part);
-               if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_SWAP_PARTITION]))
-               {
-                       errorbox(ctr[TR_UNABLE_TO_MOUNT_SWAP_PARTITION]);
-                       goto EXIT;
-               }
-       }
-       snprintf(commandstring, STRING_SIZE, "/bin/mount %s4 /harddisk/var", hdparams.devnode_part);
-       if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_LOG_FILESYSTEM]))
-       {
-               errorbox(ctr[TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM]);
+
+       rc = hw_mount_filesystems(destination, DESTINATION_MOUNT_PATH);
+       if (rc) {
+               errorbox(ctr[TR_UNABLE_TO_MOUNT_FILESYSTEMS]);
                goto EXIT;
        }
 
+       newtPopWindow();
+
+       // Extract files...
        snprintf(commandstring, STRING_SIZE,
                "/bin/tar -C /harddisk  -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma 2>/dev/null");
        
@@ -468,12 +465,6 @@ int main(int argc, char *argv[])
        /* Save language und local settings */
        write_lang_configs(shortlangname);
 
-       /* mount proc filesystem */
-       mysystem("mkdir /harddisk/proc");
-       mysystem("/bin/mount --bind /proc /harddisk/proc");
-       mysystem("/bin/mount --bind /dev  /harddisk/dev");
-       mysystem("/bin/mount --bind /sys  /harddisk/sys");
-
        /* Build cache lang file */
        snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
        if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_LANG_CACHE]))
@@ -483,32 +474,34 @@ int main(int argc, char *argv[])
        }
 
        /* Update /etc/fstab */
-       snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE1#UUID=$(/sbin/blkid %s1 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+       snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE1#UUID=$(/sbin/blkid %s -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", destination->part_boot);
        system(commandstring);
-       snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE2#UUID=$(/sbin/blkid %s2 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+       snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE2#UUID=$(/sbin/blkid %s -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", destination->part_swap);
        system(commandstring);
-       snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE3#UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+       snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE3#UUID=$(/sbin/blkid %s -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", destination->part_root);
        system(commandstring);
-       snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE4#UUID=$(/sbin/blkid %s4 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+       snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE4#UUID=$(/sbin/blkid %s -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", destination->part_data);
        system(commandstring);
 
-       if (fstype == EXT2) {
-               replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
-               replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
-       } else if (fstype == REISERFS) {
-               replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
-               replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
-       } else if (fstype == EXT3) {
-               replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
-               replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
-       } else if (fstype == EXT4) {
-               replace("/harddisk/etc/fstab", "FSTYPE", "ext4");
-               replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
+       switch (destination->filesystem) {
+               case HW_FS_REISERFS:
+                       replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
+                       replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
+                       break;
+
+               case HW_FS_EXT4:
+               case HW_FS_EXT4_WO_JOURNAL:
+                       replace("/harddisk/etc/fstab", "FSTYPE", "ext4");
+                       replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
+                       break;
+
+               default:
+                       assert(0);
        }
 
        replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
 
-       snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#root=ROOT#root=UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/boot/grub/grub.conf", hdparams.devnode_part);
+       snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#root=ROOT#root=UUID=$(/sbin/blkid %s -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/boot/grub/grub.conf", destination->part_root);
        system(commandstring);
 
        mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
@@ -520,12 +513,12 @@ int main(int argc, char *argv[])
         */
        FILE *f = NULL;
        if (f = fopen("/harddisk/boot/grub/device.map", "w")) {
-               fprintf(f, "(hd0) %s\n", hdparams.devnode_disk);
+               fprintf(f, "(hd0) %s\n", destination->path);
                fclose(f);
        }
 
        snprintf(commandstring, STRING_SIZE, 
-                "/usr/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
+                "/usr/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", destination->path);
        if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) {
                errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
                goto EXIT;
@@ -537,7 +530,7 @@ int main(int argc, char *argv[])
                replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage");
                replace("/harddisk/boot/grub/grub.conf", "#serial", "serial");
                replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal");
-               replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400n8 panic=10 ");
+               replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,115200n8 panic=10 ");
 
                /*inittab*/
                replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:");
@@ -559,9 +552,11 @@ int main(int argc, char *argv[])
                        "cp /cdrom/%s /harddisk/var/ipfire/backup", restore_file);
                mysystem(commandstring);
        }
-       
-       mysystem("umount /cdrom");
-       snprintf(commandstring, STRING_SIZE, "/usr/bin/eject /dev/%s", sourcedrive);
+
+       // Umount source drive and eject
+       hw_umount(SOURCE_MOUNT_PATH);
+
+       snprintf(commandstring, STRING_SIZE, "/usr/bin/eject %s", sourcedrive);
        mysystem(commandstring);
 
        if (!unattended) {
@@ -577,49 +572,28 @@ EXIT:
 
        if (!(allok))
                newtWinMessage(title, ctr[TR_OK], ctr[TR_PRESS_OK_TO_REBOOT]);  
-       
-       freekeyvalues(ethernetkv);
-
-       if (allok && !allok_fastexit)
-       {
-               if (unattended) {
-                       fprintf(flog, "Entering unattended setup\n");
-                       if (unattended_setup(unattendedkv)) {
-                               snprintf(commandstring, STRING_SIZE, "/bin/sleep 10");
-                               runcommandwithstatus(commandstring, "Unattended installation finished, system will reboot");
-                       } else {
-                               errorbox("Unattended setup failed.");
-                               goto EXIT;
-                       }
-               }
 
+       if (allok) {
                fflush(flog);
                fclose(flog);
-               newtFinished();
-
-               if (system("/bin/umount /harddisk/proc"))
-                       printf("Unable to umount /harddisk/proc.\n"); 
-       } else {
-               fflush(flog);
-               fclose(flog);
-               newtFinished();
        }
 
-       fcloseall();
+       newtFinished();
+
+       // Free resources
+       free(sourcedrive);
 
-       if (swap_file) {
-               snprintf(commandstring, STRING_SIZE, "/bin/swapoff %s2", hdparams.devnode_part);
+       if (destination) {
+               hw_umount_filesystems(destination, DESTINATION_MOUNT_PATH);
+               free(destination);
        }
 
-       newtFinished();
+       if (selected_disks)
+               hw_free_disks(selected_disks);
 
-       system("/bin/umount /harddisk/proc >/dev/null 2>&1");
-       system("/bin/umount /harddisk/dev >/dev/null 2>&1");
-       system("/bin/umount /harddisk/sys >/dev/null 2>&1");
+       hw_free(hw);
 
-       system("/bin/umount /harddisk/var >/dev/null 2>&1");
-       system("/bin/umount /harddisk/boot >/dev/null 2>&1");
-       system("/bin/umount /harddisk >/dev/null 2>&1");
+       fcloseall();
 
        if (!(allok))
                system("/etc/halt");