#include "install.h"
#define _GNU_SOURCE
-#define CDROM_INSTALL 0
-#define URL_INSTALL 1
-#define DISK_INSTALL 2
-#define INST_FILECOUNT 6000
+#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[];
-
-int detect_smp() {
- FILE *fd = NULL;
- char line[STRING_SIZE];
- int cpu_count = 0;
-
- if ((fd = fopen("/proc/cpuinfo", "r")) == NULL) {
- return 0;
- }
- while (fgets(line, STRING_SIZE, fd) != NULL) {
- if (strstr(line, "processor") == line) {
- cpu_count++;
- }
- }
- (void)fclose(fd);
- return (cpu_count > 1);
-}
-
-long calc_swapsize(long memory, long disk) {
- if (memory < 128) {
- return 256;
- }
- if (memory > 1024) {
- return 512;
- }
-
- return memory*2;
-}
-
-long calc_rootsize(long free, long max) {
- long root;
-
- root = max / 2;
- if (root < 512) {
- return 0;
- }
- if (root > 2048) {
- root = 2048;
- }
- return root;
-}
+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[11], sourcedrive[5]; /* Device holder. */
+ char harddrive[30], sourcedrive[5]; /* Device holder. */
struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
- int cdmounted = 0; /* Loop flag for inserting a cd. */
int rc = 0;
char commandstring[STRING_SIZE];
- char *installtypes[] = { "CDROM/USB", "HTTP/FTP", NULL };
- int installtype = CDROM_INSTALL;
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;
FILE *handle, *cmdfile;
char line[STRING_SIZE];
char string[STRING_SIZE];
- long maximum_free = 0, current_free;
- long memory = 0;
+ long memory = 0, disk = 0, free;
long system_partition, boot_partition, root_partition, swap_file;
int scsi_disk = 0;
char *yesnoharddisk[3]; // char *yesnoharddisk = { "NO", "YES", NULL };
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");
} else {
fgets(line, STRING_SIZE, cmdfile);
- if (strstr (line, "noide") == NULL) {
- fprintf(flog, "Initializing IDE controllers.\n");
- initialize_ide();
- } else {
- fprintf(flog, "Skipping IDE detection.\n");
- }
- if (strstr (line, "nousb") == NULL) {
- fprintf(flog, "Initializing USB controllers.\n");
- initialize_usb();
- } else {
- fprintf(flog, "Skipping USB detection.\n");
- }
+
// check if we have to make an unattended install
if (strstr (line, "unattended") != NULL) {
unattended = 1;
- }
- // Loading the cdrom-filesystem
- mysystem("/sbin/modprobe iso9660");
+ runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
+ }
}
- if (unattended) {
- runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
- }
+ // 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 ide-cd");
+// mysystem("/sbin/modprobe ide-disk");
+// mysystem("/sbin/modprobe ehci-hcd");
+// mysystem("/sbin/modprobe uhci-hcd");
+// mysystem("/sbin/modprobe ohci-hcd");
+// mysystem("/sbin/modprobe ohci1394");
+// mysystem("/sbin/modprobe sd_mod");
+// mysystem("/sbin/modprobe sr_mod");
+// mysystem("/sbin/modprobe usb-storage");
+// mysystem("/sbin/modprobe usbhid");
+// mysystem("/sbin/modprobe ahci");
+
+ 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++)
goto EXIT;
if (!unattended) {
- rc = newtWinMenu("Language selection",
- "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
+ rc = newtWinMenu("Language selection", "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
langnames, &choice, "Ok", NULL);
}
ctr = langtrs[choice];
strcpy(shortlangname, shortlangnames[choice]);
- fprintf(flog, "Selected language: %s\n", shortlangname);
- newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
newtPushHelpLine(ctr[TR_HELPLINE]);
- sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
- if (!unattended) {
- sprintf(message, ctr[TR_WELCOME], NAME);
- newtWinMessage(title, ctr[TR_OK], message);
+ sprintf(message, ctr[TR_WELCOME], NAME);
+ newtWinMessage(title, ctr[TR_OK], message);
- sprintf(message, ctr[TR_SELECT_INSTALLATION_MEDIA_LONG], NAME);
- rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
- 50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
- ctr[TR_CANCEL], NULL);
- } else {
- rc = 1;
- installtype = CDROM_INSTALL;
- }
-
- if (rc == 2)
+ switch (mysystem("/bin/mountsource.sh")) {
+ case 0:
+ break;
+ case 10:
+ errorbox(ctr[TR_NO_CDROM]);
goto EXIT;
-
- // Starting hardware detection
- runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
- runcommandwithstatus("/bin/probenic.sh install", ctr[TR_PROBING_HARDWARE]);
-
- /* 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);
}
- /* 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 ipfire-<VERSION>.tbz2 */
- if (checktarball(SNAME "-" VERSION ".tbz2", ctr[TR_ENTER_URL])) {
- errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]);
- 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);
i = 0;
while (found == 0) {
errorbox(ctr[TR_NO_HARDDISK]);
goto EXIT;
}
- fgets(harddrive, 11, handle);
+ fgets(harddrive, 30, handle);
fclose(handle);
/* load unattended configuration */
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(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode_disk);
if (unattended) {
hardyn = 1;
+ } else {
+ yesnoharddisk[0] = ctr[TR_NO];
+ yesnoharddisk[1] = ctr[TR_YES];
+ yesnoharddisk[2] = NULL;
}
- yesnoharddisk[0] = ctr[TR_NO];
- yesnoharddisk[1] = ctr[TR_YES];
- yesnoharddisk[2] = NULL;
-
while (! hardyn) {
rc = newtWinMenu(title, message,
50, 5, 5, 6, yesnoharddisk,
goto EXIT;
if (!unattended) {
- sprintf(message, "(TR) Bitte waehlen Sie ihr Dateisystem aus:");
- rc = newtWinMenu("(TR) Dateisystemauswahl", message,
+ sprintf(message, ctr[TR_CHOOSE_FILESYSTEM]);
+ rc = newtWinMenu( ctr[TR_CHOOSE_FILESYSTEM], message,
50, 5, 5, 6, fstypes, &fstype, ctr[TR_OK],
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 */
if ((handle = fopen("/tmp/disksize", "r"))) {
fgets(line, STRING_SIZE-1, handle);
if (sscanf (line, "%s", string)) {
- maximum_free = atoi(string) / 1024;
+ disk = atoi(string) / 1024;
}
fclose(handle);
}
- fprintf(flog, "maximum_free = %ld, memory = %ld", maximum_free, memory);
+ fprintf(flog, "Disksize = %ld, memory = %ld", disk, memory);
- swap_file = calc_swapsize(memory, maximum_free);
-
- if (maximum_free < 768 + swap_file ) {
- if (maximum_free < 768) {
- errorbox(ctr[TR_DISK_TOO_SMALL]);
- goto EXIT;
- }
-
- if (!unattended) {
- rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
- }
- else {
- rc = 1;
- }
-
- if (rc != 1)
- goto EXIT;
- swap_file = 0;
- }
-
- boot_partition = 20; /* in MB */
- current_free = maximum_free - boot_partition - swap_file;
-
- if (current_free < 768) {
- errorbox(ctr[TR_DISK_TOO_SMALL]);
- goto EXIT;
- }
+ /* Calculating Swap-Size dependend of Ram Size */
+ if (memory <= 256)
+ swap_file = 128;
+ else if (memory <= 1024 && memory > 256)
+ swap_file = 256;
+ else
+ swap_file = memory / 4;
- root_partition = calc_rootsize(current_free, maximum_free);
+ /* Calculating Root-Size dependend of Max Disk Space */
+ if ( disk < 756 )
+ root_partition = 200;
+ else if ( disk >= 756 && disk <= 3072 )
+ root_partition = 512;
+ else
+ root_partition = 2048;
+
- if (root_partition == 0) {
- errorbox(ctr[TR_DISK_TOO_SMALL]);
- goto EXIT;
- } else {
- current_free = current_free - root_partition;
- }
+ /* Calculating the amount of free space */
+ boot_partition = 20; /* in MB */
+ system_partition = disk - ( root_partition + swap_file + boot_partition );
- if (current_free < 256) {
- errorbox(ctr[TR_DISK_TOO_SMALL]);
- goto EXIT;
- }
-
- system_partition = current_free;
-
- fprintf(flog, "boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
- boot_partition, swap_file, system_partition, root_partition);
-
+ fprintf(flog, ", boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
+ boot_partition, swap_file, system_partition, root_partition);
+ rc = 0;
+
+ if ( (!unattended) && (((disk - (root_partition + swap_file + boot_partition)) < 256 ) && ((disk - (root_partition + boot_partition )) > 256)) ) {
+ rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
+ if (rc == 1){
+ swap_file = 0;
+ system_partition = disk - ( root_partition + swap_file + boot_partition );
+ fprintf(flog, "Changing Swap Size to 0 MB.\n");
+ }
+ else if (rc == 2){
+ fprintf(flog, "Disk is too small.\n");
+ errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT;
+ }
+ }
+ else if (disk - (root_partition + swap_file + boot_partition) >= 256) {
+
+ }
+ else {
+ fprintf(flog, "Disk is too small.\n");
+ errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT;
+ }
+
handle = fopen("/tmp/partitiontable", "w");
/* Make swapfile */
- if (swap_file) {
- 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,,L,\n",
- boot_partition, root_partition);
- }
+ if (swap_file) {
+ 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,,L,\n",
+ boot_partition, root_partition);
+ }
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, "/bin/mke2fs -T ext3 -c");
+ sprintf(mkfscommand, "/sbin/mke2fs -T ext3");
}
- snprintf(commandstring, STRING_SIZE, "/bin/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]);
goto EXIT;
}
- if (installtype == URL_INSTALL) {
- snprintf(commandstring, STRING_SIZE,
- "/bin/wget -q -O - %s/" SNAME "-" VERSION ".tbz2 | /bin/tar -C /harddisk -xvjf -", url);
- }
-
- if (installtype == CDROM_INSTALL) {
- snprintf(commandstring, STRING_SIZE,
- "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
- }
+ snprintf(commandstring, STRING_SIZE,
+ "/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]))
errorbox(ctr[TR_UNABLE_TO_INSTALL_FILES]);
goto EXIT;
}
-
- /* Save USB controller type to modules.conf */
- write_usb_modules_conf();
/* 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,
+// /* 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");
+ 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/boot/grub/grub.conf", "MOUNT", "ro");
}
+ replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
+
/* Going to make our initrd... */
- snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -v -g /boot/ipfirerd.img -k %s-ipfire", KERNEL_VERSION);
+/* snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/local/bin/rebuild-initrd");
runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
- snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -v -g /boot/ipfirerd-smp.img -k %s-ipfire-smp", 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);
- replace( "/harddisk/boot/grub/grubbatch", "DEVICE", hdparams.devnode_disk);
+ mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
- /* restore permissions */
- chmod("/harddisk/boot/grub/grubbatch", S_IXUSR | S_IRUSR | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH);
+ system("sed -e 's#/harddisk#/#g' -e 's#//#/#g' < /proc/mounts > /harddisk/etc/mtab");
snprintf(commandstring, STRING_SIZE,
- "/sbin/chroot /harddisk /boot/grub/grubbatch");
+ "/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;
}
-
- mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
+
+ /* 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");
- ejectcdrom(sourcedrive);
+ snprintf(commandstring, STRING_SIZE, "/usr/bin/eject /dev/%s", sourcedrive);
+ mysystem(commandstring);
if (!unattended) {
sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
fclose(flog);
newtFinished();
- if (!unattended) {
- // Copy our scanned nics to the disk and lock because scan doesn't work in chroot
- system("touch /harddisk/var/ipfire/ethernet/scan_lock");
- system("cp -f /tmp/scanned_nics /harddisk/var/ipfire/ethernet/scanned_nics");
- if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
- printf("Unable to run setup.\n");
- system("rm -f /harddisk/var/ipfire/ethernet/scan_lock");
- }
+// 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;
}