#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;
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 };
- int fstype = REISER4;
+ char *fstypes[] = { "ext2", "ext3", "ReiserFS", NULL };
+ 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");
}
}
- 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 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");
-
+ // Load common modules
mysystem("/sbin/modprobe iso9660"); // CDROM
mysystem("/sbin/modprobe ext2"); // Boot patition
mysystem("/sbin/modprobe vfat"); // USB key
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.
sprintf(hdparams.devnode_part, "/dev/%s%s", harddrive,raid_disk ? "p" : "");
/* Now the names after the machine is booted. Only scsi is affected
and we only install on the first scsi disk. */
- { char tmp[30];
- strcpy(tmp, scsi_disk ? "sda" : harddrive);
- sprintf(hdparams.devnode_disk_run, "/dev/%s", tmp);
- sprintf(hdparams.devnode_part_run, "/dev/%s%s", tmp, raid_disk ? "p" : "");
- }
fprintf(flog, "Destination drive: %s\n", hdparams.devnode_disk);
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;
* the disk.
*/
/* Don't use mysystem here so we can redirect output */
- sprintf(commandstring, "/bin/sfdisk -s /dev/%s > /tmp/disksize 2> /dev/null", harddrive);
+ sprintf(commandstring, "/sbin/sfdisk -s /dev/%s > /tmp/disksize 2> /dev/null", harddrive);
system(commandstring);
/* Calculate amount of disk space */
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 )
fclose(handle);
- snprintf(commandstring, STRING_SIZE, "/bin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk);
+ snprintf(commandstring, STRING_SIZE, "/sbin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk);
if (runcommandwithstatus(commandstring, ctr[TR_PARTITIONING_DISK]))
{
errorbox(ctr[TR_UNABLE_TO_PARTITION]);
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");
} else if (fstype == REISERFS) {
mysystem("/sbin/modprobe reiserfs");
sprintf(mkfscommand, "/sbin/mkreiserfs -f");
} else if (fstype == EXT3) {
mysystem("/sbin/modprobe ext3");
- sprintf(mkfscommand, "/sbin/mke2fs -T ext3 -c");
+ sprintf(mkfscommand, "/sbin/mke2fs -T ext3");
}
- snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
+ snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -I 128 %s1", hdparams.devnode_part);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]);
}
snprintf(commandstring, STRING_SIZE,
- "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
+ "/bin/tar -C /harddisk -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma 2>/dev/null");
if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
ctr[TR_INSTALLING_FILES]))
/* Save language und local settings */
write_lang_configs(shortlangname);
- /* touch the modules.dep files */
- snprintf(commandstring, STRING_SIZE,
- "/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep",
- KERNEL_VERSION);
- mysystem(commandstring);
- 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");
mysystem("/bin/mount --bind /sys /harddisk/sys");
/* Build cache lang file */
- snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
+ snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_LANG_CACHE]))
{
errorbox(ctr[TR_UNABLE_TO_INSTALL_LANG_CACHE]);
}
/* Update /etc/fstab */
- replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run);
-
- 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");
+ snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE1#UUID=$(/sbin/blkid %s1 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+ system(commandstring);
+ snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE2#UUID=$(/sbin/blkid %s2 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+ system(commandstring);
+ snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE3#UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+ system(commandstring);
+ snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE4#UUID=$(/sbin/blkid %s4 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+ system(commandstring);
+
+ 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");
} else if (fstype == EXT3) {
- snprintf(commandstring, STRING_SIZE, "tune2fs -j %s3", hdparams.devnode_part);
- if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
- {
- errorbox(ctr[TR_JOURNAL_ERROR]);
- replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
- goto NOJOURNAL;
- }
- snprintf(commandstring, STRING_SIZE, "tune2fs -j %s4", hdparams.devnode_part);
- if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
- {
- errorbox(ctr[TR_JOURNAL_ERROR]);
- replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
- goto NOJOURNAL;
- }
replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
NOJOURNAL:
- replace("/harddisk/etc/mkinitcpio.conf", "MODULES=\"", "MODULES=\"ext3 ");
replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
}
replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
- /* Build the emergency ramdisk with all drivers */
- mysystem("cp -f /harddisk/etc/mkinitcpio.conf /harddisk/etc/mkinitcpio.conf.org");
-
- replace("/harddisk/etc/mkinitcpio.conf", " autodetect ", " ");
- snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-emergency.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);
- runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-
- mysystem("cp -f /harddisk/etc/mkinitcpio.conf.org /harddisk/etc/mkinitcpio.conf");
+ snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#root=ROOT#root=UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/boot/grub/grub.conf", hdparams.devnode_part);
+ system(commandstring);
- /* mkinitcpio has a problem if ide and pata are included */
- if ( scsi_disk==1 ) {
- /* Remove the ide hook if we install sda */
- replace("/harddisk/etc/mkinitcpio.conf", " ide ", " ");
- } else {
- /* Remove the pata & sata hook if we install hda */
- replace("/harddisk/etc/mkinitcpio.conf", " pata ", " ");
- replace("/harddisk/etc/mkinitcpio.conf", " sata ", " ");
- }
- /* 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 );
- runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-
- sprintf(string, "root=%s3", hdparams.devnode_part_run);
- replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
- system("sed -e 's#harddisk\\/##g' < /proc/mounts > /harddisk/etc/mtab");
+ system("/bin/sed -e 's#/harddisk#/#g' -e 's#//#/#g' < /proc/mounts > /harddisk/etc/mtab");
snprintf(commandstring, STRING_SIZE,
- "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
+ "/usr/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) {
errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
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);
+ snprintf(commandstring, STRING_SIZE, "/usr/bin/eject /dev/%s", sourcedrive);
mysystem(commandstring);
if (!unattended) {
fclose(flog);
newtFinished();
- if (!unattended) {
- if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
- printf("Unable to run setup.\n");
- }
+// if (!unattended) {
+// if (system("/usr/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
+// printf("Unable to run setup.\n");
+// }
if (system("/bin/umount /harddisk/proc"))
printf("Unable to umount /harddisk/proc.\n");
system("/bin/umount /harddisk/var");
system("/bin/umount /harddisk/boot");
system("/bin/umount /harddisk");
-
- system("/etc/halt");
+
+ if (!(allok))
+ system("/etc/halt");
return 0;
}
projects / people / pmueller / ipfire-2.x.git / blobdiff