#define CDROM_INSTALL 0
#define URL_INSTALL 1
#define DISK_INSTALL 2
-#define INST_FILECOUNT 6600
-#define UNATTENDED_CONF "/cdrom/data/unattended.conf"
+#define INST_FILECOUNT 7000
+#define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
int raid_disk = 0;
FILE *flog = NULL;
return (cpu_count > 1);
}
-int generate_packages_list(char *packages, const char *rpmdir, const char *source) {
-
- FILE *fd=NULL;
- char buffer[STRING_SIZE];
- bzero(buffer, sizeof(buffer));
-
- if ((fd = fopen(source, "r")) == NULL) {
- (void) fprintf(flog, "Packages file %s not found\n", source);
- return -1;
- }
- while (fgets(buffer, sizeof(buffer), fd) != NULL) {
- int length = -1;
- length = strlen(buffer)-1;
- if (length<=0) {
- continue;
- }
- if (buffer[length] == '\n') {
- buffer[length]='\0';
- }
- length = snprintf(packages, STRING_SIZE, "%s %s/%s", strdup(packages), rpmdir, buffer);
- if ((length <0) || (length >STRING_SIZE)) {
- (void) fprintf(flog, "rpm command line too long: %d\n%s", length, packages);
- return -1;
- }
- }
- if (ferror(fd)) {
- (void) fprintf(flog, "Error reading file\n");
- (void) fclose(fd);
- return -1;
- }
- (void) fclose(fd);
- return 0;
-}
-
long calc_swapsize(long memory, long disk) {
if (memory < 128) {
return 256;
char keymap[STRING_SIZE];
char language[STRING_SIZE];
char timezone[STRING_SIZE];
+ char theme[STRING_SIZE];
char green_address[STRING_SIZE];
char green_netmask[STRING_SIZE];
char green_netaddress[STRING_SIZE];
char green_broadcast[STRING_SIZE];
char root_password[STRING_SIZE];
char admin_password[STRING_SIZE];
- char serial_console[STRING_SIZE];
- char reversesort[STRING_SIZE];
findkey(unattendedkv, "DOMAINNAME", domainname);
findkey(unattendedkv, "HOSTNAME", hostname);
findkey(unattendedkv, "KEYMAP", keymap);
findkey(unattendedkv, "LANGUAGE", language);
findkey(unattendedkv, "TIMEZONE", timezone);
+ findkey(unattendedkv, "THEME", theme);
findkey(unattendedkv, "GREEN_ADDRESS", green_address);
findkey(unattendedkv, "GREEN_NETMASK", green_netmask);
findkey(unattendedkv, "GREEN_NETADDRESS", green_netaddress);
findkey(unattendedkv, "GREEN_BROADCAST", green_broadcast);
findkey(unattendedkv, "ROOT_PASSWORD", root_password);
findkey(unattendedkv, "ADMIN_PASSWORD", admin_password);
- findkey(unattendedkv, "SERIAL_CONSOLE", serial_console);
- findkey(unattendedkv, "REVERSE_NICS", reversesort);
/* write main/settings. */
replacekeyvalue(mainsettings, "DOMAINNAME", domainname);
replacekeyvalue(mainsettings, "KEYMAP", keymap);
replacekeyvalue(mainsettings, "LANGUAGE", language);
replacekeyvalue(mainsettings, "TIMEZONE", timezone);
+ replacekeyvalue(mainsettings, "THEME", theme);
writekeyvalues(mainsettings, "/harddisk" CONFIG_ROOT "/main/settings");
freekeyvalues(mainsettings);
fprintf(flog, "unattended: Starting setup\n");
/* network */
-
fprintf(flog, "unattended: setting up network configuration\n");
(void) readkeyvalues(ethernetkv, "/harddisk" CONFIG_ROOT "/ethernet/settings");
return 0;
}
fprintf(file, "ServerName %s\n", hostname);
- fclose(file);
+ fclose(file);
fprintf(flog, "unattended: writing hosts\n");
if (!(hosts = fopen("/harddisk/etc/hosts", "w")))
}
fprintf(hosts, "127.0.0.1\tlocalhost\n");
fprintf(hosts, "%s\t%s.%s\t%s\n", green_address, hostname, domainname, hostname);
- fclose(hosts);
+ fclose(hosts);
fprintf(flog, "unattended: writing hosts.allow\n");
if (!(file = fopen("/harddisk/etc/hosts.allow", "w")))
{
errorbox("unattended: ERROR writing hosts.allow");
- return 0;
+ return 0;
}
fprintf(file, "sshd : ALL\n");
fprintf(file, "ALL : localhost\n");
fprintf(file, "ALL : ALL\n");
fclose(file);
- if (strcmp(serial_console, "yes") != 0) {
- snprintf(commandstring, STRING_SIZE,
- "/bin/chroot /harddisk /bin/sed -i -e \"s/^s0/#s0/\" /etc/inittab");
- if (mysystem(commandstring)) {
- errorbox("unattended: ERROR modifying inittab");
- return 0;
- }
-
- snprintf(commandstring, STRING_SIZE,
- "/bin/chroot /harddisk /bin/sed -i -e \"s/^serial/#serial/; s/^terminal/#terminal/\" /boot/grub/grub.conf");
- if (mysystem(commandstring)) {
- errorbox("unattended: ERROR modifying inittab");
- return 0;
- }
- }
-
- /* set reverse sorting of interfaces */
- if (strcmp(reversesort, "yes") == 0) {
- mysystem("/bin/touch /harddisk/var/ipfire/ethernet/reverse_nics");
- }
-
/* set root password */
fprintf(flog, "unattended: setting root password\n");
-
snprintf(commandstring, STRING_SIZE,
- "/bin/chroot /harddisk /bin/sh -c \"echo 'root:%s' | /usr/sbin/chpasswd\"", root_password);
+ "/sbin/chroot /harddisk /bin/sh -c \"echo 'root:%s' | /usr/sbin/chpasswd\"", root_password);
if (mysystem(commandstring)) {
errorbox("unattended: ERROR setting root password");
return 0;
}
-
+
/* set admin password */
fprintf(flog, "unattended: setting admin password\n");
snprintf(commandstring, STRING_SIZE,
- "/bin/chroot /harddisk /usr/bin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", admin_password);
+ "/sbin/chroot /harddisk /usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", admin_password);
if (mysystem(commandstring)) {
errorbox("unattended: ERROR setting admin password");
- return 0;
+ return 0;
}
-
- return 1;
+ return 1;
}
int main(int argc, char *argv[])
int cdmounted = 0; /* Loop flag for inserting a cd. */
int rc = 0;
char commandstring[STRING_SIZE];
- char *installtypes[] = { "CDROM", "HTTP/FTP", NULL };
+ char *installtypes[] = { "CDROM/USB", "HTTP/FTP", NULL };
int installtype = CDROM_INSTALL;
char insertmessage[STRING_SIZE];
char insertdevnode[STRING_SIZE];
fprintf(flog, "Manual FDISK selected.\n");
fdisk = 1;
}
- if (strstr (line, "nopcmcia") == NULL) {
- fprintf(flog, "Initializing PCMCIA controllers.\n");
- pcmcia = initialize_pcmcia();
- if (pcmcia) {
- fprintf (flog, "Detected PCMCIA Controller: %s.\n", pcmcia);
- sprintf(commandstring, "/sbin/modprobe %s", pcmcia);
- mysystem("/sbin/modprobe pcmcia_core");
- mysystem(commandstring);
- mysystem("/sbin/modprobe ds");
- /* pcmcia netcard drivers are not available from Boot floppy,
- * they will be loaded from Drivers floppy later */
- } else {
- fprintf (flog, "Detected No PCMCIA Controller.\n");
- }
- } else {
- fprintf(flog, "Skipping PCMCIA detection.\n");
- }
if (strstr (line, "nousb") == NULL) {
fprintf(flog, "Initializing USB controllers.\n");
initialize_usb();
// make some beeps before wiping the system :)
if (unattended) {
- runcommandwithstatus("/bin/beep -f 450 -r 10 -D 800 -n -f 900 -l 1000", "WARNING: Unattended installation will start in 10 seconds...");
+ runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
}
/* German is the default */
mysystem("/bin/setfont lat0-16");
- newtDrawRootText(14, 0, NAME " v" VERSION " - " SLOGAN );
+ newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
newtPushHelpLine(ctr[TR_HELPLINE]);
if (!unattended) {
// Starting hardware detection
runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
- switch (mysystem("/bin/mountsource.sh")) {
- case 0:
- installtype = CDROM_INSTALL;
- cdmounted = 1;
- break;
- case 1:
- installtype = DISK_INSTALL;
- break;
- case 10:
- errorbox(ctr[TR_NO_CDROM]);
- goto EXIT;
- }
+ /* CDROM INSTALL */
+ if (installtype == CDROM_INSTALL) {
+
+ switch (mysystem("/bin/mountsource.sh")) {
+ case 0:
+ installtype = CDROM_INSTALL;
+ cdmounted = 1;
+ break;
+ case 1:
+ installtype = DISK_INSTALL;
+ break;
+ case 10:
+ errorbox(ctr[TR_NO_CDROM]);
+ goto EXIT;
+ }
+
+ /* read source drive letter */
+ if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
+ errorbox(ctr[TR_ERROR_PROBING_CDROM]);
+ goto EXIT;
+ }
+ fgets(sourcedrive, 5, handle);
+ fprintf(flog, "Source drive: %s\n", sourcedrive);
+ fclose(handle);
- /* read source drive letter */
- if ((handle = fopen("/source_device", "r")) == NULL) {
- errorbox("ERROR reading source_device");
+ snprintf(cdromparams.devnode, STRING_SIZE, "/dev/%s", sourcedrive);
+ cdromparams.module = 0;
+ fprintf(flog, "Source device: %s\n", cdromparams.devnode);
}
- fgets(sourcedrive, 5, handle);
- fprintf(flog, "Source drive: %s\n", sourcedrive);
- fclose(handle);
-
- if (installtype == CDROM_INSTALL) {
- snprintf(cdromparams.devnode, STRING_SIZE, "/dev/%s", sourcedrive);
- cdromparams.module = 0;
- fprintf(flog, "Source device: %s\n", cdromparams.devnode);
+
+ /* Configure the network now! */
+ if (installtype == URL_INSTALL) {
+ /* Network driver and params. */
+ if (!(networkmenu(ethernetkv))) {
+ errorbox(ctr[TR_NETWORK_SETUP_FAILED]);
+ goto EXIT;
+ }
+
+ /* Check for ipcop-<VERSION>.tbz2 */
+ if (checktarball(SNAME "-" VERSION ".tbz2", ctr[TR_ENTER_URL])) {
+ errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]);
+ goto EXIT;
+ }
}
/* Get device for the HD. This has to succeed. */
} else
sprintf(harddrive, "hd%c", hdletter);
+ fprintf(flog, "Destination drive: %s\n", harddrive);
/* load unattended configuration */
if (unattended) {
* the disk.
*/
/* Don't use mysystem here so we can redirect output */
- sprintf(commandstring, "/bin/sfdisk -s /dev/%s > /disksize 2> /dev/null", harddrive);
+ sprintf(commandstring, "/bin/sfdisk -s /dev/%s > /tmp/disksize 2> /dev/null", harddrive);
system(commandstring);
/* Calculate amount of disk space */
- if ((handle = fopen("/disksize", "r")))
+ if ((handle = fopen("/tmp/disksize", "r")))
{
fgets(line, STRING_SIZE-1, handle);
if (sscanf (line, "%s", string)) {
handle = fopen("/tmp/partitiontable", "w");
-
/* Make swapfile */
if (swap_file) {
- fprintf(handle, ",%ld,L,*\n,%ld,S,\n,%ld,L,\n",
+ fprintf(handle, ",%ld,L,*\n,%ld,S,\n,%ld,L,\n,,L,\n",
boot_partition, swap_file, root_partition);
} else {
- fprintf(handle, ",%ld,L,*\n,0,0,\n,%ld,L,\n",
+ fprintf(handle, ",%ld,L,*\n,0,0,\n,%ld,L,\n,,L,\n",
boot_partition, root_partition);
}
goto EXIT;
}
- mysystem("/bin/udevstart");
+ mysystem("/sbin/udevstart");
if (raid_disk)
snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %sp1", hdparams.devnode);
if (swap_file) {
if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/bin/mkswap %sp2", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/sbin/mkswap %sp2", hdparams.devnode);
else
- snprintf(commandstring, STRING_SIZE, "/bin/mkswap %s2", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/sbin/mkswap %s2", hdparams.devnode);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_SWAPSPACE]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_SWAPSPACE]);
}
if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %sp3", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -f %sp3", hdparams.devnode);
else
- snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %s3", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -f %s3", hdparams.devnode);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_ROOT_FILESYSTEM]))
{
goto EXIT;
}
-/* if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %sp4", hdparams.devnode);
+ if (raid_disk)
+ snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -f %sp4", hdparams.devnode);
else
- snprintf(commandstring, STRING_SIZE, "/bin/mkreiserfs -f %s4", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/sbin/mkfs.reiser4 -f %s4", hdparams.devnode);
if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
goto EXIT;
- } */
+ }
/* Mount harddisk. */
if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/sbin/mount %sp3 /harddisk", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/bin/mount %sp3 /harddisk", hdparams.devnode);
else
- snprintf(commandstring, STRING_SIZE, "/sbin/mount %s3 /harddisk", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/bin/mount %s3 /harddisk", hdparams.devnode);
if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_ROOT_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM]);
mkdir("/harddisk/var/log", S_IRWXU|S_IRWXG|S_IRWXO);
if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/sbin/mount %sp1 /harddisk/boot", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/bin/mount %sp1 /harddisk/boot", hdparams.devnode);
else
- snprintf(commandstring, STRING_SIZE, "/sbin/mount %s1 /harddisk/boot", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/bin/mount %s1 /harddisk/boot", hdparams.devnode);
if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_BOOT_FILESYSTEM]))
{
}
if (swap_file) {
if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/bin/swapon %sp2", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/sbin/swapon %sp2", hdparams.devnode);
else
- snprintf(commandstring, STRING_SIZE, "/bin/swapon %s2", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/sbin/swapon %s2", hdparams.devnode);
if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_SWAP_PARTITION]))
{
errorbox(ctr[TR_UNABLE_TO_MOUNT_SWAP_PARTITION]);
goto EXIT;
}
}
-/* if (raid_disk)
- snprintf(commandstring, STRING_SIZE, "/sbin/mount %sp4 /harddisk/var", hdparams.devnode);
+ if (raid_disk)
+ snprintf(commandstring, STRING_SIZE, "/bin/mount %sp4 /harddisk/var", hdparams.devnode);
else
- snprintf(commandstring, STRING_SIZE, "/sbin/mount %s4 /harddisk/var", hdparams.devnode);
+ snprintf(commandstring, STRING_SIZE, "/bin/mount %s4 /harddisk/var", hdparams.devnode);
if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_LOG_FILESYSTEM]))
{
errorbox(ctr[TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM]);
goto EXIT;
- } */
-
- snprintf(commandstring, STRING_SIZE, "/bin/mount -o ro %s /cdrom", insertdevnode);
+ }
snprintf(commandstring, STRING_SIZE, "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
- /* if (runcommandwithprogress(60, 4, title, commandstring, 4600,
- * ctr[TR_INSTALLING_FILES]))
- * {
- * errorbox(ctr[TR_UNABLE_TO_INSTALL_FILES]);
- * goto EXIT;
- * }
- */
-
- if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_FILES]))
+ if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
+ ctr[TR_INSTALLING_FILES]))
{
errorbox(ctr[TR_UNABLE_TO_INSTALL_FILES]);
goto EXIT;
/* touch the modules.dep files */
snprintf(commandstring, STRING_SIZE,
- "/bin/chroot /harddisk /usr/bin/touch /lib/modules/%s/modules.dep",
+ "/sbin/chroot /harddisk /usr/bin/touch /lib/modules/%s/modules.dep",
KERNEL_VERSION);
mysystem(commandstring);
snprintf(commandstring, STRING_SIZE,
- "/bin/chroot /harddisk /usr/bin/touch /lib/modules/%s-smp/modules.dep",
+ "/sbin/chroot /harddisk /usr/bin/touch /lib/modules/%s-smp/modules.dep",
KERNEL_VERSION);
mysystem(commandstring);
/* Rename uname */
rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
- /* Write PCMCIA Config */
- if (pcmcia) {
- handle = fopen("/harddisk/etc/modules.conf", "a");
- if (handle != NULL) {
- fprintf (handle, "# PCMCIA Settings\n");
- fprintf (handle, "alias pcmcia-controller %s\n", pcmcia);
+ /* *always* write disk configuration */
+ if (!(write_disk_configs(&hdparams))){
+ errorbox(ctr[TR_ERROR_WRITING_CONFIG]);
+ goto EXIT;
+ }
+
+ /* mount proc filesystem */
+ mysystem("mkdir /harddisk/proc");
+ mysystem("/bin/mount -t proc none /harddisk/proc");
+ mysystem("/bin/mount --bind /dev /harddisk/dev");
+
+
+
+ /* if we detected SCSI then fixup */
+ /* doesn't really work cause it sometimes creates a ramdisk on ide systems */
+/* mysystem("/bin/probecntrl.sh");
+ if ((handle = fopen("/cntrldriver", "r")))
+ {
+ char *driver;
+ fgets(line, STRING_SIZE-1, handle);
fclose(handle);
+ line[strlen(line) - 1] = 0;
+ driver = strtok(line, ".");
+ fprintf(flog, "Detected SCSI driver %s\n",driver);
+ if (strlen(driver) > 1) {
+ fprintf(flog, "Fixing up ipfirerd.img\n");
+ mysystem("/sbin/chroot /harddisk /sbin/modprobe loop");
+ mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
+ snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd.img %s", driver, KERNEL_VERSION);
+ runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+ snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd-smp.img %s-smp", driver, KERNEL_VERSION);
+ runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+ mysystem("/sbin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
}
+ } */
+
+ /* Build cache lang file */
+ snprintf(commandstring, STRING_SIZE, "/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]);
+ goto EXIT;
}
- handle = fopen("/harddisk/etc/pcmcia.conf", "w");
- if (handle != NULL) {
- if (pcmcia) {
- fprintf (handle, "PCMCIA=yes\n");
- fprintf (handle, "PCIC=%s\n", pcmcia);
- } else {
- fprintf (handle, "PCMCIA=no\n");
- fprintf (handle, "PCIC=\n");
- }
- fprintf (handle, "CARDMGR_OPTS=\n");
- fprintf (handle, "SCHEME=\n");
- fclose(handle);
+ if (raid_disk)
+ sprintf(string, "root=%sp3", hdparams.devnode);
+ else
+ sprintf(string, "root=%s3", hdparams.devnode);
+ replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
+ replace( "/harddisk/boot/grub/grubbatch", "DEVICE", hdparams.devnode);
+
+ /* restore permissions */
+ chmod("/harddisk/boot/grub/grubbatch", S_IXUSR | S_IRUSR | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH);
+
+ snprintf(commandstring, STRING_SIZE,
+ "/sbin/chroot /harddisk /boot/grub/grubbatch");
+ if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) {
+ errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
+ goto EXIT;
}
- /* *always* write disk configuration */
- if (!(write_disk_configs(&hdparams))){
- errorbox(ctr[TR_ERROR_WRITING_CONFIG]);
- goto EXIT;
+ /* Update /etc/fstab */
+ replace( "/harddisk/etc/fstab", "DEVICE", hdparams.devnode);
+
+ /* Install bootsplash */
+ mysystem("/bin/installbootsplash.sh");
+
+ mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
+ mysystem("umount /harddisk/proc");
+ mysystem("umount /harddisk/dev");
+
+ if (!unattended) {
+ sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
+ NAME, SNAME, SNAME, NAME, NAME, NAME);
+ newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
}
+
+ allok = 1;
- /*
- Allow the user to restore their configuration from a floppy.
- It uses tar. If the tar fails for any reason, show user an
- error and go back to the restore/skip question. This gives
- the user the chance to have another go. */
-
EXIT:
fprintf(flog, "Install program ended.\n");
fflush(flog);
{
/* /proc is needed by the module checker. We have to mount it
* so it can be seen by setup, which is run chrooted. */
- if (system("/sbin/mount proc -t proc /harddisk/proc"))
+ if (system("/bin/mount proc -t proc /harddisk/proc"))
printf("Unable to mount proc in /harddisk.");
else
{
- if (system("/bin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
- printf("Unable to run setup.\n");
- if (system("/sbin/umount /harddisk/proc"))
+
+ if (!unattended) {
+ if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
+ printf("Unable to run setup.\n");
+ }
+ else {
+ fprintf(flog, "Entering unattended setup\n");
+ unattended_setup(unattendedkv);
+ snprintf(commandstring, STRING_SIZE, "/bin/sleep 10");
+ runcommandwithstatus(commandstring, "Unattended installation finished, system will reboot");
+ }
+
+ if (system("/bin/umount /harddisk/proc"))
printf("Unable to umount /harddisk/proc.\n");
}
}
fcloseall();
- system("/bin/swapoff /harddisk/swapfile");
- system("/sbin/umount /harddisk/var/log");
- system("/sbin/umount /harddisk/boot");
- system("/sbin/umount /harddisk");
+ if (swap_file) {
+ if (raid_disk)
+ snprintf(commandstring, STRING_SIZE, "/bin/swapoff %sp2", hdparams.devnode);
+ else
+ snprintf(commandstring, STRING_SIZE, "/bin/swapoff %s2", hdparams.devnode);
+ }
+
+ newtFinished();
+
+ system("/bin/umount /harddisk/var");
+ system("/bin/umount /harddisk/boot");
+ system("/bin/umount /harddisk");
system("/etc/halt");
projects / people / teissler / ipfire-2.x.git / blobdiff