From e57bc1fd98ae0793401de2d8f831fb91363bccce Mon Sep 17 00:00:00 2001 From: ms Date: Fri, 7 Jul 2006 11:42:26 +0000 Subject: [PATCH] =?utf8?q?Ge=C3=A4ndert:=20=20=20*=20=C3=84nderungen=20am?= =?utf8?q?=20Installer.=20=20=20*=20Fix=20im=20header.pl.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@203 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/cfgroot/header.pl | 7 ++-- doc/ChangeLog | 71 ++++++++++++++++++++++++++++++++ make.sh | 4 +- src/install+setup/install/main.c | 41 ++++++++++-------- 4 files changed, 101 insertions(+), 22 deletions(-) diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 2e621fb8a3..18c1dad3fb 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -740,12 +740,13 @@ sub openpage { END ; if ($settings{'FX'} eq 'on') { - print < - } else { - print < diff --git a/doc/ChangeLog b/doc/ChangeLog index 55f27f4d6e..aaf24106c9 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,74 @@ +------------------------------------------------------------------------ +r202 | ms | 2006-07-06 22:51:35 +0200 (Do, 06 Jul 2006) | 4 lines + +Bugfixes: + * SCSI-SMP-Kernel vergessen. + * scsigrub.conf war fehlerhaft und nicht komplett. + +------------------------------------------------------------------------ +r201 | ms | 2006-07-06 22:15:31 +0200 (Do, 06 Jul 2006) | 8 lines + +Bugfixes: + * Framebufferdevices + * Bootscripts vergessen ;-) + * Hoffentlich den Doppel-Anmelde-Fehler behoben. + * Jetzt Tux im Konsolensplash. + * Libjpeg in ISO enthalten. + * Installer gefixt. + +------------------------------------------------------------------------ +r200 | ms | 2006-07-06 15:38:27 +0200 (Do, 06 Jul 2006) | 3 lines + +Geändert: + * Bootsplash im SVN verschoben, da nur noch einer vorhanden ist. + +------------------------------------------------------------------------ +r199 | ms | 2006-07-06 15:33:16 +0200 (Do, 06 Jul 2006) | 7 lines + +Hinzugefügt: + * Nodes für Framebuffer. +Geändert: + * Bootvorgang für Laufbalken bearbeitet. + * Installer sollte Bootsplash in initrd installieren. + * Neue Boot-Bilder. + +------------------------------------------------------------------------ +r198 | ms | 2006-07-06 12:24:53 +0200 (Do, 06 Jul 2006) | 3 lines + +Geändert: + * Bootsplash-Software-Update. + +------------------------------------------------------------------------ +r197 | ms | 2006-07-05 23:22:59 +0200 (Mi, 05 Jul 2006) | 6 lines + +Hinzugefügt: + * Fehlende Grafik. + * QoS-Script, das aus den Einstellungen ein Bashscript generiert. +Geändert: + * QoS-CGI-Update. + +------------------------------------------------------------------------ +r196 | casemaster | 2006-07-04 20:10:48 +0200 (Di, 04 Jul 2006) | 2 lines + +Korrekturen + +------------------------------------------------------------------------ +r195 | ms | 2006-07-04 18:00:11 +0200 (Di, 04 Jul 2006) | 4 lines + +Geändert: + * Paar Pfade in den Bootsplash-Configs verbogen. + * Hintergundbilder für die Konsolen gesetzt. (Ich hoffe das klappt so.) + +------------------------------------------------------------------------ +r194 | ms | 2006-07-04 16:44:19 +0200 (Di, 04 Jul 2006) | 7 lines + +Hinzugefügt: + * Neuer Bootsplash. - Anders organisiert. + * Passwort für User Cyrus. +Geändert: + * Install-Message in deutsch. + * Grub.conf angepasst für Bootsplash (nur IDE). + ------------------------------------------------------------------------ r193 | ms | 2006-07-03 20:50:48 +0200 (Mo, 03 Jul 2006) | 5 lines diff --git a/make.sh b/make.sh index 91f976d561..39648a6e37 100644 --- a/make.sh +++ b/make.sh @@ -913,9 +913,9 @@ build) # Setzen des IPFire Builds if [ "$FIREBUILD" ]; then - echo "$FIREBUILD" > $CONFIG_ROOT/firebuild + echo "$FIREBUILD" > $BASEDIR/build/var/ipfire/firebuild else - echo "_(OvO)_" > $CONFIG_ROOT/firebuild + echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild fi buildinstaller diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 990f942f62..fab8de3d56 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -193,14 +193,17 @@ int main(int argc, char *argv[]) sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN); 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); - - if (rc == 2) - goto EXIT; - + /* 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); + * + * if (rc == 2) + * goto EXIT; + * This is for avoiding the question for a network installation. Set to cdrom. + */ + sprintf(installtype, CDROM_INSTALL, NAME); + if (installtype == CDROM_INSTALL) { /* First look for an IDE CDROM. */ @@ -378,7 +381,7 @@ int main(int argc, char *argv[]) goto EXIT; } - /* Check for ipcop-.tgz */ + /* Check for ipfire-.tgz */ if (!(checktarball(SNAME "-" VERSION ".tgz"))) { errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]); @@ -690,13 +693,20 @@ int main(int argc, char *argv[]) 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(); @@ -954,14 +964,11 @@ RESTORE: } /* 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"); - } + if ((handle = fopen("/scsidriver", "r"))) + mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd-smp.img"); mysystem("/bin/chroot /harddisk /bin/umount -n /proc"); #endif #ifdef __alpha__ -- 2.39.2