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=ccb52647632db0933c1e717d8fb08653e5449dd9;hp=20b868fa344afc070ef4a50183d3632f04a166b3;hb=cf4dd3c01bd8ab20a43c24549e3191b1585fbd85;hpb=53bd94654892c7bad524625a6a426e694c7caeb0

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 20b868fa34..ccb5264763 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -11,12 +11,12 @@
 #include "install.h"
 #define _GNU_SOURCE
  
-#define INST_FILECOUNT 6200
+#define INST_FILECOUNT 8400
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
-#define REISER4 0
-#define REISERFS 1
-#define EXT3 2
+#define EXT2 0
+#define REISERFS 2
+#define EXT3 1
 
 FILE *flog = NULL;
 char *mylog;
@@ -29,20 +29,22 @@ struct  nic  nics[20] = { { "" , "" , "" } }; // only defined for compile
 struct knic knics[20] = { { "" , "" , "" , "" } }; // only defined for compile
 
 extern char *en_tr[];
+extern char *es_tr[];
 extern char *de_tr[];
+extern char *fr_tr[];
 
 int main(int argc, char *argv[])
 {
-	char *langnames[] = { "Deutsch", "English", NULL };
-	char *shortlangnames[] = { "de", "en", NULL };
-	char **langtrs[] = { de_tr, en_tr, NULL };
+	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 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[] = { "Reiser4", "ReiserFS", "ext3", NULL };
+	char *fstypes[] = { "ext2", "ext3", "ReiserFS", NULL };
 	int fstype = REISERFS;
 	int choice;
 	int i;
@@ -116,14 +118,15 @@ int main(int argc, char *argv[])
 	mysystem("/sbin/modprobe ide-generic");
 	mysystem("/sbin/modprobe ide-cd");
 	mysystem("/sbin/modprobe ide-disk");
+	mysystem("/sbin/modprobe ehci-hcd");
 	mysystem("/sbin/modprobe uhci-hcd");
 	mysystem("/sbin/modprobe ohci-hcd");
-	mysystem("/sbin/modprobe ehci-hcd");
 	mysystem("/sbin/modprobe ohci1394");
 	mysystem("/sbin/modprobe sd_mod");
 	mysystem("/sbin/modprobe sr_mod");
 	mysystem("/sbin/modprobe usb-storage");
 	mysystem("/sbin/modprobe usbhid");
+	mysystem("/sbin/modprobe ahci");
 
 	mysystem("/sbin/modprobe iso9660"); // CDROM
 	mysystem("/sbin/modprobe ext2"); // Boot patition
@@ -300,12 +303,12 @@ int main(int argc, char *argv[])
 	fprintf(flog, "Disksize = %ld, memory = %ld", disk, memory);
 	
 	 /* Calculating Swap-Size dependend of Ram Size */
-	if (memory < 128)
-		swap_file = 32;
-	else if (memory >= 1024)
-		swap_file = 512;
+	if (memory <= 256)
+		swap_file = 128;
+	else if (memory <= 1024 && memory > 256)
+		swap_file = 256;
 	else 
-		swap_file = memory;
+		swap_file = memory / 4;
 	
   /* Calculating Root-Size dependend of Max Disk Space */
   if ( disk < 756 )
@@ -364,9 +367,9 @@ int main(int argc, char *argv[])
 		goto EXIT;
 	}
 	
-	if (fstype == REISER4) {
-		mysystem("/sbin/modprobe reiser4");
-		sprintf(mkfscommand, "/sbin/mkfs.reiser4 -y");
+	if (fstype == EXT2) {
+		mysystem("/sbin/modprobe ext2");
+		sprintf(mkfscommand, "/sbin/mke2fs -T ext2 -c");
 	} else if (fstype == REISERFS) {
 		mysystem("/sbin/modprobe reiserfs");
 		sprintf(mkfscommand, "/sbin/mkreiserfs -f");
@@ -438,7 +441,7 @@ int main(int argc, char *argv[])
 	}
 
 	snprintf(commandstring, STRING_SIZE,
-		"/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
+		"/bin/tar -C /harddisk  -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma");
 	
 	if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
 		ctr[TR_INSTALLING_FILES]))
@@ -481,9 +484,9 @@ int main(int argc, char *argv[])
 	/* Update /etc/fstab */
 	replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run);
 	
-	if (fstype == REISER4) {
-		replace("/harddisk/etc/fstab", "FSTYPE", "reiser4");
-		replace("/harddisk/boot/grub/grub.conf", "MOUNT", "rw");
+	if (fstype == EXT2) {
+		replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
+		replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
 	} else if (fstype == REISERFS) {
 		replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
 		replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");