#define INST_FILECOUNT 6200
#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;
extern char *en_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", NULL };
+ char *shortlangnames[] = { "de", "en", "fr" ,NULL };
+ char **langtrs[] = { de_tr, en_tr, fr_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;
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
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 )
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");
}
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]))
/* 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");