installer: Fix umounting destination

[ipfire-2.x.git] / src / installer / main.c

diff --git a/src/installer/main.c b/src/installer/main.c
index 9262a400c7b45a4276eef15c12096926306ffc5a..d02db2834afeccb60c891d88964640c6edf44000 100644 (file)
--- a/src/installer/main.c
+++ b/src/installer/main.c
@@ -25,7 +25,7 @@
 
 #define INST_FILECOUNT 21000
 #define LICENSE_FILE   "/cdrom/COPYING"
-#define SOURCE_TEMPFILE "/tmp/downloaded-image.iso"
+#define SOURCE_TEMPFILE "/tmp/downloads/image.iso"
 
 extern char url[STRING_SIZE];
 
@@ -289,7 +289,7 @@ static void parse_command_line(struct config* c) {
                        char* key = strsep(&val, "=");
 
                        // serial console
-                       if (strcmp(token, "console=ttyS0") == 0)
+                       if ((strcmp(key, "console") == 0) && (strncmp(val, "ttyS", 4) == 0))
                                c->serial_console = 1;
 
                        // enable networking?
@@ -412,7 +412,13 @@ int main(int argc, char *argv[]) {
                setlocale(LC_ALL, language);
        }
 
-       char* helpline = center_string(_("<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"), screen_cols);
+       // Set helpline
+       char* helpline = NULL;
+       if (config.unattended)
+               helpline = center_string(_("Unattended mode"), screen_cols);
+       else
+               helpline = center_string(_("<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen"), screen_cols);
+
        newtPushHelpLine(helpline);
 
        if (!config.unattended) {
@@ -496,7 +502,7 @@ int main(int argc, char *argv[]) {
 
                                FILE* f = fopen(SOURCE_TEMPFILE, "r");
                                if (f) {
-                                       sourcedrive = SOURCE_TEMPFILE;
+                                       sourcedrive = strdup(SOURCE_TEMPFILE);
                                        fclose(f);
                                } else {
                                        char reason[STRING_SIZE] = "-";
@@ -833,16 +839,6 @@ int main(int argc, char *argv[]) {
                free(backup_file);
        }
 
-       // Umount the destination drive
-       hw_umount_filesystems(destination, DESTINATION_MOUNT_PATH);
-
-       // Stop the RAID array if we are using RAID
-       if (destination->is_raid)
-               hw_stop_all_raid_arrays(logfile);
-
-       // Umount source drive and eject
-       hw_umount(SOURCE_MOUNT_PATH);
-
        // Download and execute the postinstall script
        if (*config.postinstall) {
                snprintf(commandstring, sizeof(commandstring),
@@ -854,10 +850,44 @@ int main(int argc, char *argv[]) {
                }
        }
 
-       snprintf(commandstring, STRING_SIZE, "/usr/bin/eject %s", sourcedrive);
-       mysystem(logfile, commandstring);
+       // Umount the destination drive
+       statuswindow(60, 4, title, _("Umounting filesystems..."));
 
-       if (!config.unattended) {
+       rc = hw_umount_filesystems(destination, DESTINATION_MOUNT_PATH);
+       if (rc) {
+               // Show an error message if filesystems could not be umounted properly
+               snprintf(message, sizeof(message),
+                       _("Could not umount all filesystems successfully:\n\n  %s"), strerror(errno));
+               errorbox(message);
+               goto EXIT;
+       }
+
+       // Umount source drive and eject
+       hw_umount(SOURCE_MOUNT_PATH);
+
+       // Free downloaded ISO image
+       if (strcmp(sourcedrive, SOURCE_TEMPFILE) == 0) {
+               rc = unlink(sourcedrive);
+               if (rc)
+                       fprintf(flog, "Could not free downloaded ISO image: %s\n", sourcedrive);
+
+       // or eject real images
+       } else {
+               snprintf(commandstring, STRING_SIZE, "/usr/bin/eject %s", sourcedrive);
+               mysystem(logfile, commandstring);
+       }
+       newtPopWindow();
+
+       // Stop the RAID array if we are using RAID
+       if (destination->is_raid)
+               hw_stop_all_raid_arrays(logfile);
+
+       // Show a short message that the installation went well and
+       // wait a moment so that all disk caches get flushed.
+       if (config.unattended) {
+               splashWindow(title, _("Unattended installation has finished. The system will be shutting down in a moment..."), 5);
+
+       } else {
                snprintf(message, sizeof(message), _(
                        "%s was successfully installed!\n\n"
                        "Please remove any installation mediums from this system and hit the reboot button. "
@@ -880,19 +910,28 @@ EXIT:
        newtFinished();
 
        // Free resources
-       free(system_release);
-       free(roottext);
-       free(helpline);
+       if (system_release)
+               free(system_release);
+
+       if (roottext)
+               free(roottext);
+
+       if (helpline)
+               free(helpline);
+
+       if (sourcedrive)
+               free(sourcedrive);
 
-       free(sourcedrive);
-       free(destination);
+       if (destination)
+               free(destination);
 
        hw_stop_all_raid_arrays(logfile);
 
        if (selected_disks)
                hw_free_disks(selected_disks);
 
-       hw_free(hw);
+       if (hw)
+               hw_free(hw);
 
        fcloseall();