X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=60b8cba502af58dd15bfcf5141ef126bdf61986c;hp=d18f16bfa7e94ca91625caa80043f9cd4d95b08f;hb=8c4f3d176b15855e3da914569f669bfd70ff9253;hpb=dfa59dbd1f12f3427c51215e76b4a825f8a169fc

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index d18f16bfa7..60b8cba502 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -11,7 +11,7 @@
 #include "install.h"
 #define _GNU_SOURCE
  
-#define INST_FILECOUNT 8400
+#define INST_FILECOUNT 10700
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 #define EXT2 0
@@ -33,15 +33,16 @@ 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 */
@@ -49,7 +50,7 @@ int main(int argc, char *argv[])
 	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;
@@ -135,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])
@@ -151,10 +152,10 @@ 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;
@@ -553,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;
@@ -605,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");