X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=60b8cba502af58dd15bfcf5141ef126bdf61986c;hp=dc3ac1934029f7be773e966de70af2eedba719e5;hb=599d475a53aa6050014fd1f347f2ace43d955dde;hpb=8caf7b64c83ea3641ee66a1e5b35d965ce78f666

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index dc3ac1934..60b8cba50 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -11,12 +11,13 @@
 #include "install.h"
 #define _GNU_SOURCE
  
-#define INST_FILECOUNT 8400
+#define INST_FILECOUNT 10700
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 #define EXT2 0
-#define REISERFS 2
 #define EXT3 1
+#define EXT4 2
+#define REISERFS 3
 
 FILE *flog = NULL;
 char *mylog;
@@ -32,23 +33,24 @@ extern char *en_tr[];
 extern char *es_tr[];
 extern char *de_tr[];
 extern char *fr_tr[];
+extern char *pl_tr[];
 
 int main(int argc, char *argv[])
 {
 
 	char discl_msg[40000] =	"Disclaimer\n";
 
-	char *langnames[] = { "Deutsch", "English", "Français", "Español", NULL };
-	char *shortlangnames[] = { "de", "en", "fr", "es", NULL };
-	char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL };
+	char *langnames[] = { "Deutsch", "English", "Français", "Español", "Polski", NULL };
+	char *shortlangnames[] = { "de", "en", "fr", "es", "pl", NULL };
+	char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, NULL };
 	char hdletter;
 	char harddrive[30], sourcedrive[5];	/* Device holder. */
 	struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
 	int rc = 0;
 	char commandstring[STRING_SIZE];
 	char mkfscommand[STRING_SIZE];
-	char *fstypes[] = { "ext2", "ext3", "ReiserFS", NULL };
-	int fstype = REISERFS;
+	char *fstypes[] = { "ext2", "ext3", "ext4", "ReiserFS", NULL };
+	int fstype = EXT4;
 	int choice;
 	int i;
 	int found = 0;
@@ -69,6 +71,7 @@ int main(int argc, char *argv[])
 	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] = "";
@@ -109,6 +112,10 @@ int main(int argc, char *argv[])
 		    unattended = 1;
 		    runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
 		}		
+		// check if we have to patch for serial console
+		if (strstr (line, "console=ttyS0") != NULL) {
+		    serialconsole = 1;
+		}
 	}
 
 	// Read gpl ...
@@ -129,7 +136,7 @@ int main(int argc, char *argv[])
 	/* German is the default */
 	for (choice = 0; langnames[choice]; choice++)
 	{
-		if (strcmp(langnames[choice], "Deutsch") == 0)
+		if (strcmp(langnames[choice], "English") == 0)
 			break;
 	}
 	if (!langnames[choice])
@@ -145,29 +152,27 @@ int main(int argc, char *argv[])
 
 	newtPushHelpLine(ctr[TR_HELPLINE]);
 
-	sprintf(message, ctr[TR_WELCOME], NAME);
-	newtWinMessage(title, ctr[TR_OK], message);
-
 	if (!unattended) {
+		sprintf(message, ctr[TR_WELCOME], NAME);
+		newtWinMessage(title, ctr[TR_OK], message);
+
 		if (disclaimerbox(discl_msg)==0) {
 			errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]);
 			goto EXIT;
 		}
 	}
 
-	switch (mysystem("/bin/mountsource.sh")) {
-	    case 0:
-				break;
-	    case 10:
-      	errorbox(ctr[TR_NO_CDROM]);
-		goto EXIT;
-	}
+	mysystem("/bin/mountsource.sh");
 
-	/* read source drive letter */
 	if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
-		errorbox(ctr[TR_ERROR_PROBING_CDROM]);
-		goto EXIT;
+		newtWinMessage(title, ctr[TR_OK], ctr[TR_NO_LOCAL_SOURCE]);
+		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);
 	fprintf(flog, "Source drive: %s\n", sourcedrive);
 	fclose(handle);
@@ -253,6 +258,12 @@ int main(int argc, char *argv[])
 	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,
@@ -260,7 +271,7 @@ int main(int argc, char *argv[])
 			ctr[TR_CANCEL], NULL);
 	} else {
 	    rc = 1;
-	    fstype = REISERFS;
+	    fstype = EXT3;
 	}
 	if (rc == 2)
 		goto EXIT;
@@ -370,6 +381,9 @@ int main(int argc, char *argv[])
 	} 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");
 	}
 
 	snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -I 128 %s1", hdparams.devnode_part);
@@ -482,7 +496,9 @@ int main(int argc, char *argv[])
 		replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
 	} else if (fstype == EXT3) {
 		replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
-		NOJOURNAL:
+		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");
 	}
 
@@ -501,7 +517,28 @@ int main(int argc, char *argv[])
 		errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
 		goto EXIT;
 	}
-	
+
+	/* Serial console ? */
+	if (serialconsole) {
+		/* grub */
+		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 ");
+
+		/*inittab*/
+		replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:");
+		replace("/harddisk/etc/inittab", "2:2345:respawn:", "#2:2345:respawn:");
+		replace("/harddisk/etc/inittab", "3:2345:respawn:", "#3:2345:respawn:");
+		replace("/harddisk/etc/inittab", "4:2345:respawn:", "#4:2345:respawn:");
+		replace("/harddisk/etc/inittab", "5:2345:respawn:", "#5:2345:respawn:");
+		replace("/harddisk/etc/inittab", "6:2345:respawn:", "#6:2345:respawn:");
+		replace("/harddisk/etc/inittab", "#7:2345:respawn:", "7:2345:respawn:");
+	}
+
+	/* Set marker that the user has already accepted the gpl */
+	mysystem("/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");
@@ -517,7 +554,7 @@ int main(int argc, char *argv[])
 	if (!unattended) {
 		sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
 				NAME, SNAME, NAME);
-		newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
+		newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_PRESS_OK_TO_REBOOT], message);
 	}
 
 	allok = 1;
@@ -547,10 +584,11 @@ EXIT:
 		fclose(flog);
 		newtFinished();
 
-//		if (!unattended) {
-//			if (system("/usr/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
-//				printf("Unable to run setup.\n");
-//		}
+		if (unattended) {
+			// Remove Setup autorun after boot
+			if (system("rm -f /harddisk/etc/rc.d/rcsysinit.d/S75firstsetup"))
+				printf("Unable to disable setup autorun.\n");
+		}
 
 		if (system("/bin/umount /harddisk/proc"))
 			printf("Unable to umount /harddisk/proc.\n"); 
@@ -568,13 +606,13 @@ EXIT:
 
 	newtFinished();
 
-	system("/bin/umount /harddisk/proc");
-	system("/bin/umount /harddisk/dev");
-	system("/bin/umount /harddisk/sys");
+	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");
 
-	system("/bin/umount /harddisk/var");
-	system("/bin/umount /harddisk/boot");
-	system("/bin/umount /harddisk");
+	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");
 
 	if (!(allok))
 		system("/etc/halt");