]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - src/installer/main.c
installer: Create a config struct
[ipfire-2.x.git] / src / installer / main.c
index 513ebf41a2cce2fdc9f2fd1c9e362c9261ef0fe6..761293fe86b2913e81eaf9fca03764b025ff0e08 100644 (file)
 
 #include <assert.h>
 #include <errno.h>
+#include <libsmooth.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mount.h>
 
 #include "hw.h"
-#include "install.h"
 
 // Translation
 #include <libintl.h>
@@ -25,6 +25,7 @@
 #define INST_FILECOUNT 21000
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 #define LICENSE_FILE   "/cdrom/COPYING"
+#define SOURCE_TEMPFILE "/tmp/downloaded-image.iso"
 
 extern char url[STRING_SIZE];
 
@@ -225,6 +226,14 @@ static struct lang {
        { NULL, NULL },
 };
 
+static struct config {
+       int serial_console;
+       int require_networking;
+} config = {
+       .serial_console = 0,
+       .require_networking = 0,
+};
+
 int main(int argc, char *argv[]) {
        struct hw* hw = hw_init();
        const char* logfile = NULL;
@@ -246,9 +255,6 @@ int main(int argc, char *argv[]) {
        char line[STRING_SIZE];
                
        int unattended = 0;
-       int serialconsole = 0;
-       struct keyvalue *unattendedkv = initkeyvalues();
-       char restore_file[STRING_SIZE] = "";
 
        setlocale (LC_ALL, "");
        sethostname( SNAME , 10);
@@ -281,20 +287,25 @@ int main(int argc, char *argv[]) {
 
        snprintf(title, sizeof(title), "%s - %s", NAME, SLOGAN);
 
-       if (! (cmdfile = fopen("/proc/cmdline", "r")))
-       {
+       if (! (cmdfile = fopen("/proc/cmdline", "r"))) {
                fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
        } else {
                fgets(line, STRING_SIZE, cmdfile);
-               
+
                // check if we have to make an unattended install
-               if (strstr (line, "unattended") != NULL) {
+               if (strstr(line, "installer.unattended") != NULL) {
+                   splashWindow(title, _("Warning: Unattended installation will start in 10 seconds..."), 10);
                    unattended = 1;
-                   runcommandwithstatus("/bin/sleep 10", title, "WARNING: Unattended installation will start in 10 seconds...", NULL);
-               }               
+               }
+
+               // check if the installer should start networking
+               if (strstr(line, "installer.net") != NULL) {
+                       config.require_networking = 1;
+               }
+
                // check if we have to patch for serial console
                if (strstr (line, "console=ttyS0") != NULL) {
-                   serialconsole = 1;
+                       config.serial_console = 1;
                }
        }
 
@@ -314,7 +325,7 @@ int main(int argc, char *argv[]) {
                }
                langnames[NUM_LANGS] = NULL;
 
-           rc = newtWinMenu(_("Language selection"), _("Select the language you wish to use for the installation."),
+               rc = newtWinMenu(_("Language selection"), _("Select the language you wish to use for the installation."),
                        50, 5, 5, 8, langnames, &choice, _("OK"), NULL);
 
                assert(choice <= NUM_LANGS);
@@ -339,18 +350,77 @@ int main(int argc, char *argv[]) {
        /* Search for a source drive that holds the right
         * version of the image we are going to install. */
        sourcedrive = hw_find_source_medium(hw);
-
        fprintf(flog, "Source drive: %s\n", sourcedrive);
+
+       /* If we could not find a source drive, we will try
+        * downloading the install image */
        if (!sourcedrive) {
-               newtWinMessage(title, _("OK"), _("No local source media found. Starting download."));
-               runcommandwithstatus("/bin/downloadsource.sh", title, _("Downloading installation image ..."), logfile);
-               if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
-                       errorbox(_("Download error"));
-                       goto EXIT;
+               if (!unattended) {
+                       // Show the right message to the user
+                       char reason[STRING_SIZE];
+                       if (config.require_networking) {
+                               snprintf(reason, sizeof(reason),
+                                       _("The installer will now try downloading the installation image."));
+                       } else {
+                               snprintf(reason, sizeof(reason),
+                                       _("No source drive could be found.\n\n"
+                                       "You can try downloading the required installation image."));
+                       }
+                       snprintf(message, sizeof(message), "%s %s", reason,
+                               _("Please make sure to connect your machine to a network and "
+                                "the installer will try connect to acquire an IP address."));
+
+                       rc = newtWinOkCancel(title, message, 55, 12,
+                               _("Download installation image"), _("Cancel"));
+
+                       if (rc != 0)
+                               goto EXIT;
                }
 
-               fgets(sourcedrive, 5, handle);
-               fclose(handle);
+               config.require_networking = 1;
+       }
+
+       // Try starting the networking if we require it
+       if (config.require_networking) {
+               while (1) {
+                       statuswindow(60, 4, title, _("Trying to start networking (DHCP)..."));
+
+                       rc = hw_start_networking(logfile);
+                       newtPopWindow();
+
+                       // Networking was successfully started
+                       if (rc == 0) {
+                               break;
+
+                       // An error happened, ask the user what to do
+                       } else {
+                               rc = newtWinOkCancel(title, _("Networking could not be started "
+                                       "but is required to go on with the installation.\n\n"
+                                       "Please connect your machine to a network with a "
+                                       "DHCP server and retry."), 50, 10, _("Retry"), _("Cancel"));
+
+                               if (rc)
+                                       goto EXIT;
+                       }
+               }
+
+               // Download the image if required
+               while (!sourcedrive) {
+                       snprintf(commandstring, sizeof(commandstring), "/usr/bin/downloadsource.sh %s", SOURCE_TEMPFILE);
+                       runcommandwithstatus(commandstring, title, _("Downloading installation image..."), logfile);
+
+                       FILE* f = fopen(SOURCE_TEMPFILE, "r");
+                       if (f) {
+                               sourcedrive = SOURCE_TEMPFILE;
+                               fclose(f);
+                       } else {
+                               rc = newtWinOkCancel(title, _("The installation image could not be downloaded."),
+                                       60, 8, _("Retry"), _("Cancel"));
+
+                               if (rc)
+                                       goto EXIT;
+                       }
+               }
        }
 
        assert(sourcedrive);
@@ -362,14 +432,6 @@ int main(int argc, char *argv[]) {
                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.
                if (!(copying = fopen(LICENSE_FILE, "r"))) {
@@ -406,8 +468,10 @@ int main(int argc, char *argv[]) {
                        goto EXIT;
 
                // exactly one disk has been found
-               } else if (num_disks == 1) {
-                       selected_disks = hw_select_disks(disks, NULL);
+               // or if we are running in unattended mode, we will select
+               // the first disk and go with that one
+               } else if ((num_disks == 1) || (unattended && num_disks >= 1)) {
+                       selected_disks = hw_select_first_disk(disks);
 
                // more than one usable disk has been found and
                // the user needs to choose what to do with them
@@ -442,6 +506,11 @@ int main(int argc, char *argv[]) {
                        }
                }
 
+               // Don't print the auto-selected harddisk setup in
+               // unattended mode.
+               if (unattended)
+                       break;
+
                num_selected_disks = hw_count_disks(selected_disks);
 
                if (num_selected_disks == 1) {
@@ -613,7 +682,7 @@ int main(int argc, char *argv[]) {
        statuswindow(60, 4, title, _("Installing the bootloader..."));
 
        /* Serial console ? */
-       if (serialconsole) {
+       if (config.serial_console) {
                /* grub */
                FILE* f = fopen(DESTINATION_MOUNT_PATH "/etc/default/grub", "a");
                if (!f) {
@@ -649,11 +718,24 @@ int main(int argc, char *argv[]) {
        mysystem(logfile, "/usr/bin/touch /harddisk/var/ipfire/main/gpl_accepted");
 
        /* Copy restore file from cdrom */
-       if (unattended && (strlen(restore_file) > 0)) {
-               fprintf(flog, "unattended: Copy restore file\n");
-               snprintf(commandstring, STRING_SIZE, 
-                       "cp /cdrom/%s /harddisk/var/ipfire/backup", restore_file);
-               mysystem(logfile, commandstring);
+       char* backup_file = hw_find_backup_file(logfile, SOURCE_MOUNT_PATH);
+       if (backup_file) {
+               rc = 0;
+               if (!unattended) {
+                       rc = newtWinOkCancel(title, _("A backup file has been found on the installation image.\n\n"
+                               "Do you want to restore the backup?"), 50, 10, _("Yes"), _("No"));
+               }
+
+               if (rc == 0) {
+                       rc = hw_restore_backup(logfile, backup_file, DESTINATION_MOUNT_PATH);
+
+                       if (rc) {
+                               errorbox(_("An error occured when the backup file was restored."));
+                               goto EXIT;
+                       }
+               }
+
+               free(backup_file);
        }
 
        // Umount the destination drive