X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=6a500445f0dd7d379cbbd959cda02a6ffecfbe5d;hb=212cab4f9d7d4ebad0c45020f36ee145cc9be709;hp=60b8cba502af58dd15bfcf5141ef126bdf61986c;hpb=c60fa4138d8a4dd4723e2758f27f65f9a5471f3d;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 60b8cba50..6a500445f 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
@@ -13,6 +14,7 @@
  
 #define INST_FILECOUNT 10700
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
+#define LICENSE_FILE	"/cdrom/COPYING"
 
 #define EXT2 0
 #define EXT3 1
@@ -34,17 +36,19 @@ extern char *es_tr[];
 extern char *de_tr[];
 extern char *fr_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", "Polski", NULL };
-	char *shortlangnames[] = { "de", "en", "fr", "es", "pl", NULL };
-	char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, NULL };
+	char *langnames[] = { "Deutsch", "English", "Français", "Español", "Polski", "Русский", NULL };
+	char *shortlangnames[] = { "de", "en", "fr", "es", "pl", "ru", NULL };
+	char **langtrs[] = { de_tr, en_tr, fr_tr, es_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];
@@ -54,7 +58,6 @@ int main(int argc, char *argv[])
 	int choice;
 	int i;
 	int found = 0;
-	int firstrun = 0;
 	char shortlangname[10];
 	char message[1000];
 	char title[STRING_SIZE];
@@ -118,19 +121,9 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	// 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);
-	}
-
 	// 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 */
@@ -155,11 +148,6 @@ int main(int argc, char *argv[])
 	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;
-		}
 	}
 
 	mysystem("/bin/mountsource.sh");
@@ -176,7 +164,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++;
@@ -199,13 +203,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;
 		}
 	}
 
@@ -215,6 +214,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) {
@@ -238,7 +243,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 {
@@ -371,18 +376,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");
 	}
 
@@ -461,9 +466,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");
@@ -511,6 +513,15 @@ 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])) {