#include "install.h"
#define _GNU_SOURCE
-#define INST_FILECOUNT 8400
+#define INST_FILECOUNT 10700
#define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
#define EXT2 0
-#define REISERFS 2
#define EXT3 1
+#define EXT4 2
+#define REISERFS 3
FILE *flog = NULL;
char *mylog;
extern char *es_tr[];
extern char *de_tr[];
extern char *fr_tr[];
+extern char *pl_tr[];
int main(int argc, char *argv[])
{
- 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 discl_msg[40000] = "Disclaimer\n";
+
+ 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 */
int rc = 0;
char commandstring[STRING_SIZE];
char mkfscommand[STRING_SIZE];
- char *fstypes[] = { "ext2", "ext3", "ReiserFS", NULL };
- int fstype = REISERFS;
+ char *fstypes[] = { "ext2", "ext3", "ext4", "ReiserFS", NULL };
+ int fstype = EXT4;
int choice;
int i;
int found = 0;
int allok_fastexit=0;
int raid_disk = 0;
struct keyvalue *ethernetkv = initkeyvalues();
- FILE *handle, *cmdfile;
+ FILE *handle, *cmdfile, *copying;
char line[STRING_SIZE];
char string[STRING_SIZE];
long memory = 0, disk = 0, free;
char *yesnoharddisk[3]; // char *yesnoharddisk = { "NO", "YES", NULL };
int unattended = 0;
+ int serialconsole = 0;
struct keyvalue *unattendedkv = initkeyvalues();
int hardyn = 0;
char restore_file[STRING_SIZE] = "";
unattended = 1;
runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
}
+ // check if we have to patch for serial console
+ if (strstr (line, "console=ttyS0") != NULL) {
+ serialconsole = 1;
+ }
+ }
+
+ // Read gpl ...
+ if (! (copying = fopen("/COPYING", "r")))
+ {
+ fprintf(flog, "Couldn't open gpl (/COPYING)\n");
+ sprintf(discl_msg, "Couldn't open gpl (/COPYING)\n");
+ } else {
+ fread(discl_msg, 1, 40000, copying);
+ fclose(copying);
}
// Load common modules
/* 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])
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);
- switch (mysystem("/bin/mountsource.sh")) {
- case 0:
- break;
- case 10:
- errorbox(ctr[TR_NO_CDROM]);
- goto EXIT;
+ if (disclaimerbox(discl_msg)==0) {
+ errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]);
+ goto EXIT;
+ }
}
- /* read source drive letter */
+ mysystem("/bin/mountsource.sh");
+
if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
- errorbox(ctr[TR_ERROR_PROBING_CDROM]);
- goto EXIT;
+ newtWinMessage(title, ctr[TR_OK], ctr[TR_NO_LOCAL_SOURCE]);
+ runcommandwithstatus("/bin/downloadsource.sh",ctr[TR_DOWNLOADING_ISO]);
+ if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
+ errorbox(ctr[TR_DOWNLOAD_ERROR]);
+ goto EXIT;
+ }
}
+
fgets(sourcedrive, 5, handle);
fprintf(flog, "Source drive: %s\n", sourcedrive);
fclose(handle);
if (rc == 2)
goto EXIT;
+ fstypes[0]=ctr[TR_EXT2FS_DESCR];
+ fstypes[1]=ctr[TR_EXT3FS_DESCR];
+ fstypes[2]=ctr[TR_EXT4FS_DESCR];
+ fstypes[3]=ctr[TR_REISERFS_DESCR];
+ fstypes[4]=NULL;
+
if (!unattended) {
sprintf(message, ctr[TR_CHOOSE_FILESYSTEM]);
rc = newtWinMenu( ctr[TR_CHOOSE_FILESYSTEM], message,
ctr[TR_CANCEL], NULL);
} else {
rc = 1;
- fstype = REISERFS;
+ fstype = EXT3;
}
if (rc == 2)
goto EXIT;
} else if (fstype == EXT3) {
mysystem("/sbin/modprobe ext3");
sprintf(mkfscommand, "/sbin/mke2fs -T ext3");
+ } else if (fstype == EXT4) {
+ mysystem("/sbin/modprobe ext4");
+ sprintf(mkfscommand, "/sbin/mke2fs -T ext4");
}
snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -I 128 %s1", hdparams.devnode_part);
replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
} else if (fstype == EXT3) {
replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
- NOJOURNAL:
+ replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
+ } else if (fstype == EXT4) {
+ replace("/harddisk/etc/fstab", "FSTYPE", "ext4");
replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
}
errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
goto EXIT;
}
-
+
+ /* Serial console ? */
+ if (serialconsole) {
+ /* grub */
+ replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage");
+ replace("/harddisk/boot/grub/grub.conf", "#serial", "serial");
+ replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal");
+ replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400n8 panic=10 ");
+
+ /*inittab*/
+ replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:");
+ replace("/harddisk/etc/inittab", "2:2345:respawn:", "#2:2345:respawn:");
+ replace("/harddisk/etc/inittab", "3:2345:respawn:", "#3:2345:respawn:");
+ replace("/harddisk/etc/inittab", "4:2345:respawn:", "#4:2345:respawn:");
+ replace("/harddisk/etc/inittab", "5:2345:respawn:", "#5:2345:respawn:");
+ replace("/harddisk/etc/inittab", "6:2345:respawn:", "#6:2345:respawn:");
+ replace("/harddisk/etc/inittab", "#7:2345:respawn:", "7:2345:respawn:");
+ }
+
+ /* Set marker that the user has already accepted the gpl */
+ mysystem("/usr/bin/touch /harddisk/var/ipfire/main/gpl_accepted");
+
/* Copy restore file from cdrom */
if (unattended && (strlen(restore_file) > 0)) {
fprintf(flog, "unattended: Copy restore file\n");
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;
fclose(flog);
newtFinished();
-// if (!unattended) {
-// if (system("/usr/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
-// printf("Unable to run setup.\n");
-// }
+ if (unattended) {
+ // Remove Setup autorun after boot
+ if (system("rm -f /harddisk/etc/rc.d/rcsysinit.d/S75firstsetup"))
+ printf("Unable to disable setup autorun.\n");
+ }
if (system("/bin/umount /harddisk/proc"))
printf("Unable to umount /harddisk/proc.\n");
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");
projects / people / pmueller / ipfire-2.x.git / blobdiff