X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=bf0a356e10271f61d2edd24f423fff14b28b142a;hb=31901da1edb401590960558b61e31ddd9fda89c1;hp=5de914f7612c02106428bfd217a93e12d7debeaa;hpb=514bee894cc0c0825fb874689d3e245d3fdaf1de;p=ipfire-2.x.git

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 5de914f761..bf0a356e10 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -1,3 +1,4 @@
+
 /* SmoothWall install program.
  *
  * This program is distributed under the terms of the GNU General Public
@@ -11,8 +12,9 @@
 #include "install.h"
 #define _GNU_SOURCE
  
-#define INST_FILECOUNT 8400
+#define INST_FILECOUNT 14400
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
+#define LICENSE_FILE	"/cdrom/COPYING"
 
 #define EXT2 0
 #define EXT3 1
@@ -33,27 +35,30 @@ extern char *en_tr[];
 extern char *es_tr[];
 extern char *de_tr[];
 extern char *fr_tr[];
+extern char *nl_tr[];
+extern char *pl_tr[];
+extern char *ru_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", "Nederlands", "Polski", "Русский", NULL };
+	char *shortlangnames[] = { "de", "en", "fr", "es", "nl", "pl", "ru", NULL };
+	char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, nl_tr, pl_tr, ru_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 */
 	int rc = 0;
 	char commandstring[STRING_SIZE];
 	char mkfscommand[STRING_SIZE];
 	char *fstypes[] = { "ext2", "ext3", "ext4", "ReiserFS", NULL };
-	int fstype = EXT3;
+	int fstype = EXT4;
 	int choice;
 	int i;
 	int found = 0;
-	int firstrun = 0;
 	char shortlangname[10];
 	char message[1000];
 	char title[STRING_SIZE];
@@ -70,6 +75,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] = "";
@@ -110,27 +116,21 @@ int main(int argc, char *argv[])
 		    unattended = 1;
 		    runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
 		}		
-	}
-
-	// Read gpl ...
-	if (! (copying = fopen("/COPYING", "r")))
-	{
-		fprintf(flog,      "Couldn't open gpl (/COPYING)\n");
-		sprintf(discl_msg, "Couldn't open gpl (/COPYING)\n");
-	} else {
-		fread(discl_msg, 1, 40000, copying);
-		fclose(copying);
+		// check if we have to patch for serial console
+		if (strstr (line, "console=ttyS0") != NULL) {
+		    serialconsole = 1;
+		}
 	}
 
 	// Load common modules
 	mysystem("/sbin/modprobe iso9660"); // CDROM
-	mysystem("/sbin/modprobe ext2"); // Boot patition
+//	mysystem("/sbin/modprobe ext2"); // Boot patition
 	mysystem("/sbin/modprobe vfat"); // USB key
 	
 	/* 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])
@@ -146,14 +146,9 @@ int main(int argc, char *argv[])
 
 	newtPushHelpLine(ctr[TR_HELPLINE]);
 
-	sprintf(message, ctr[TR_WELCOME], NAME);
-	newtWinMessage(title, ctr[TR_OK], message);
-
 	if (!unattended) {
-		if (disclaimerbox(discl_msg)==0) {
-			errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]);
-			goto EXIT;
-		}
+		sprintf(message, ctr[TR_WELCOME], NAME);
+		newtWinMessage(title, ctr[TR_OK], message);
 	}
 
 	mysystem("/bin/mountsource.sh");
@@ -170,7 +165,23 @@ int main(int argc, char *argv[])
 	fgets(sourcedrive, 5, handle);
 	fprintf(flog, "Source drive: %s\n", sourcedrive);
 	fclose(handle);
-	
+
+	if (!unattended) {
+		// Read the license file.
+		if (!(copying = fopen(LICENSE_FILE, "r"))) {
+			sprintf(discl_msg, "Could not open license file: %s\n", LICENSE_FILE);
+			fprintf(flog, discl_msg);
+		} else {
+			fread(discl_msg, 1, 40000, copying);
+			fclose(copying);
+
+			if (disclaimerbox(discl_msg)==0) {
+				errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]);
+				goto EXIT;
+			}
+		}
+	}
+
 	i = 0;
 	while (found == 0) {
 		i++;
@@ -193,13 +204,8 @@ int main(int argc, char *argv[])
 				found = 1;
 				break;
 			case 10: // No harddisk found
-				if (firstrun == 1) {
-					errorbox(ctr[TR_NO_HARDDISK]);
-					goto EXIT;
-				}
-				// Do this if the kudzu-scan fails...
-				runcommandwithstatus("/bin/probehw.sh deep-scan", ctr[TR_PROBING_HARDWARE]);
-				firstrun = 1;
+				errorbox(ctr[TR_NO_HARDDISK]);
+				goto EXIT;
 		}
 	}
 
@@ -209,6 +215,12 @@ int main(int argc, char *argv[])
 	}
 	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) {
@@ -232,7 +244,7 @@ int main(int argc, char *argv[])
 
 	fprintf(flog, "Destination drive: %s\n", hdparams.devnode_disk);
 	
-	sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode_disk);
+	sprintf(message, ctr[TR_PREPARE_HARDDISK], harddrive_info);
 	if (unattended) {
 	    hardyn = 1;
 	} else {
@@ -265,7 +277,7 @@ int main(int argc, char *argv[])
 			ctr[TR_CANCEL], NULL);
 	} else {
 	    rc = 1;
-	    fstype = EXT3;
+	    fstype = EXT4;
 	}
 	if (rc == 2)
 		goto EXIT;
@@ -319,7 +331,7 @@ int main(int argc, char *argv[])
 		
 	
   /* Calculating the amount of free space */
-	boot_partition = 20; /* in MB */
+	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",
@@ -365,18 +377,18 @@ int main(int argc, char *argv[])
 		errorbox(ctr[TR_UNABLE_TO_PARTITION]);
 		goto EXIT;
 	}
-	
+
 	if (fstype == EXT2) {
-		mysystem("/sbin/modprobe 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");
+//		mysystem("/sbin/modprobe ext3");
 		sprintf(mkfscommand, "/sbin/mke2fs -T ext3");
 	} else if (fstype == EXT4) {
-		mysystem("/sbin/modprobe ext4");
+//		mysystem("/sbin/modprobe ext4");
 		sprintf(mkfscommand, "/sbin/mke2fs -T ext4");
 	}
 
@@ -455,9 +467,6 @@ int main(int argc, char *argv[])
 	/* Save language und local settings */
 	write_lang_configs(shortlangname);
 
-	/* Rename uname */
-	rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
-
 	/* mount proc filesystem */
 	mysystem("mkdir /harddisk/proc");
 	mysystem("/bin/mount --bind /proc /harddisk/proc");
@@ -505,13 +514,43 @@ int main(int argc, char *argv[])
 
 	system("/bin/sed -e 's#/harddisk#/#g' -e 's#//#/#g'  < /proc/mounts > /harddisk/etc/mtab");
 
+	/*
+	 * Generate device.map to help grub finding the device to install itself on.
+	 */
+	FILE *f = NULL;
+	if (f = fopen("/harddisk/boot/grub/device.map", "w")) {
+		fprintf(f, "(hd0) %s\n", hdparams.devnode_disk);
+		fclose(f);
+	}
+
 	snprintf(commandstring, STRING_SIZE, 
 		 "/usr/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
 	if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) {
 		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");
@@ -527,7 +566,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;
@@ -557,11 +596,6 @@ 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 (system("/bin/umount /harddisk/proc"))
 			printf("Unable to umount /harddisk/proc.\n"); 
 	} else {
@@ -578,13 +612,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");