X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=b1d512a71b8e00a7a3156ae66c2569f9201e8228;hb=91b20d84de68c80e230838e81a470c7bf5d3457b;hp=319dfded7ea8c1489b736d9a00feef7788bcac19;hpb=5e0a1a503b90c5c80016399308bb2585edba219b;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 319dfded7..b1d512a71 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -12,7 +12,7 @@
 #include "install.h"
 #define _GNU_SOURCE
  
-#define INST_FILECOUNT 10700
+#define INST_FILECOUNT 14400
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 #define LICENSE_FILE	"/cdrom/COPYING"
 
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 	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];
@@ -57,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];
@@ -203,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;
 		}
 	}
 
@@ -219,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) {
@@ -242,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 {