rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
ctr[TR_CANCEL], NULL);
-
+
if (rc == 2)
goto EXIT;
-
+
if (installtype == CDROM_INSTALL)
{
/* First look for an IDE CDROM. */
goto EXIT;
}
- /* Check for ipcop-<VERSION>.tgz */
+ /* Check for ipfire-<VERSION>.tgz */
if (!(checktarball(SNAME "-" VERSION ".tgz")))
{
errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]);
snprintf(commandstring, STRING_SIZE,
"/bin/wget -O - %s/" SNAME "-" VERSION ".tgz | /bin/tar -C /harddisk -xvzf -", url);
- if (runcommandwithprogress(60, 4, title, commandstring, 4600,
- ctr[TR_INSTALLING_FILES]))
+ /* 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]))
{
errorbox(ctr[TR_UNABLE_TO_INSTALL_FILES]);
goto EXIT;
}
-
+
/* Save USB controller type to modules.conf */
write_usb_modules_conf();
goto EXIT;
}
/* Set Bootsplash */
- if ((handle = fopen("/scsidriver", "r")))
- {
- mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd.img");
- mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd-smp.img");
- }
- else
- {
- mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf > /harddisk/boot/initrd.splash");
- }
+ mysystem("/bin/installbootsplash.sh");
mysystem("/bin/chroot /harddisk /bin/umount -n /proc");
#endif
#ifdef __alpha__