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", "Francais", 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 */
char commandstring[STRING_SIZE];
char mkfscommand[STRING_SIZE];
char *fstypes[] = { "Reiser4", "ReiserFS", "ext3", NULL };
- int fstype = REISER4;
+ int fstype = REISERFS;
int choice;
int i;
int found = 0;
int unattended = 0;
struct keyvalue *unattendedkv = initkeyvalues();
int hardyn = 0;
+ char restore_file[STRING_SIZE] = "";
setlocale (LC_ALL, "");
sethostname( SNAME , 10);
newtInit();
newtCls();
- /* Do usb detection first for usb keyboard */
+ newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
+ sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
+
if (! (cmdfile = fopen("/proc/cmdline", "r")))
{
fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
}
}
+ // Load ata-piix prior kudzu because kudzu use ata-generic for ich7
+ mysystem("/sbin/modprobe ata_piix");
+
+ // Starting hardware detection
+ runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ...");
+
+ // Load common modules
mysystem("/sbin/modprobe ide-generic");
- mysystem("/sbin/modprobe generic");
mysystem("/sbin/modprobe ide-cd");
mysystem("/sbin/modprobe ide-disk");
mysystem("/sbin/modprobe uhci-hcd");
mysystem("/sbin/modprobe iso9660"); // CDROM
mysystem("/sbin/modprobe ext2"); // Boot patition
mysystem("/sbin/modprobe vfat"); // USB key
+
+ runcommandwithstatus("/bin/sleep 10", "Waiting for USB Hardware ...");
/* German is the default */
for (choice = 0; langnames[choice]; choice++)
ctr = langtrs[choice];
strcpy(shortlangname, shortlangnames[choice]);
- newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
newtPushHelpLine(ctr[TR_HELPLINE]);
- sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
-
- // Starting hardware detection
- runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
sprintf(message, ctr[TR_WELCOME], NAME);
newtWinMessage(title, ctr[TR_OK], message);
fprintf(flog, "unattended: Reading unattended.conf\n");
(void) readkeyvalues(unattendedkv, UNATTENDED_CONF);
+ findkey(unattendedkv, "RESTORE_FILE", restore_file);
}
/* Make the hdparms struct and print the contents.
ctr[TR_CANCEL], NULL);
} else {
rc = 1;
- fstype = REISER4; // Reiser4 is our standard filesystem. Love it or shut up!
+ fstype = REISERFS;
}
if (rc == 2)
goto EXIT;
"/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep",
KERNEL_VERSION);
mysystem(commandstring);
- snprintf(commandstring, STRING_SIZE,
+/* snprintf(commandstring, STRING_SIZE,
"/bin/touch /harddisk/lib/modules/%s-ipfire-smp/modules.dep",
KERNEL_VERSION);
mysystem(commandstring);
+*/
/* Rename uname */
rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
if (fstype == REISER4) {
replace("/harddisk/etc/fstab", "FSTYPE", "reiser4");
- replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"reiser4 ");
replace("/harddisk/boot/grub/grub.conf", "MOUNT", "rw");
} else if (fstype == REISERFS) {
replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
}
replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
NOJOURNAL:
- replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"ext3 ");
replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
}
/* Going to make our initrd... */
snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
- snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION );
+/* snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION );
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+*/
+
sprintf(string, "root=%s3", hdparams.devnode_part_run);
replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
goto EXIT;
}
+ /* Copy restore file from cdrom */
+ if (unattended && (strlen(restore_file) > 0)) {
+ fprintf(flog, "unattended: Copy restore file\n");
+ snprintf(commandstring, STRING_SIZE,
+ "cp /cdrom/%s /harddisk/var/ipfire/backup", restore_file);
+ mysystem(commandstring);
+ }
+
mysystem("umount /cdrom");
snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive);
mysystem(commandstring);