X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Finstaller%2Fmain.c;h=6e151fbd55119bf837abea78042be8adbc7e5675;hp=4dd561ddbce6cd9ffd217e7d3c2ae2a0bd5c07eb;hb=bb75bc3b140749a736040d767ff89d25177ae330;hpb=6a91a5a72474b213bdba834175c665b963e12f5a

diff --git a/src/installer/main.c b/src/installer/main.c
index 4dd561ddbc..6e151fbd55 100644
--- 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?
@@ -502,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] = "-";
@@ -849,6 +849,18 @@ int main(int argc, char *argv[]) {
 	// 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);
+	}
+
 	// Download and execute the postinstall script
 	if (*config.postinstall) {
 		snprintf(commandstring, sizeof(commandstring),
@@ -860,9 +872,6 @@ int main(int argc, char *argv[]) {
 		}
 	}
 
-	snprintf(commandstring, STRING_SIZE, "/usr/bin/eject %s", sourcedrive);
-	mysystem(logfile, commandstring);
-
 	if (!config.unattended) {
 		snprintf(message, sizeof(message), _(
 			"%s was successfully installed!\n\n"
@@ -886,19 +895,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();