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);
+
if (disclaimerbox(discl_msg)==0) {
errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]);
goto EXIT;
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,38400 panic=10 ");
+ 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", "#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;
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");