Geändert:

* Änderungen am Installer.
  * Fix im header.pl.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@203 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

config/cfgroot/header.pl

@@ -740,12 +740,13 @@ sub openpage {
 END
 ;
     if ($settings{'FX'} eq 'on') {
-	print <<END
+    print <<END
     <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)">
     <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)">
-    } else { 
+END
-	print <<END 
+;
     }
+    print <<END
     <link rel="shortcut icon" href="/favicon.ico" />
     <style type="text/css">\@import url(/include/style.css);</style>
     <style type="text/css">\@import url(/include/menu.css);</style>

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<EFBFBD>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<EFBFBD>gt:
+  * Nodes f<>r Framebuffer.
+Ge<EFBFBD>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<EFBFBD>ndert:
+  * Bootsplash-Software-Update.
+
+------------------------------------------------------------------------
+r197 | ms | 2006-07-05 23:22:59 +0200 (Mi, 05 Jul 2006) | 6 lines
+
+Hinzugef<EFBFBD>gt:
+  * Fehlende Grafik.
+  * QoS-Script, das aus den Einstellungen ein Bashscript generiert.
+Ge<EFBFBD>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<EFBFBD>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<EFBFBD>gt:
+  * Neuer Bootsplash. - Anders organisiert.
+  * Passwort f<>r User Cyrus.
+Ge<EFBFBD>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
 

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

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);
+	/* sprintf(message, ctr[TR_SELECT_INSTALLATION_MEDIA_LONG], NAME);
-	rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
+	 * rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
-		50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
+	 *	50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
-		ctr[TR_CANCEL], NULL);
+	 *	ctr[TR_CANCEL], NULL); 
-	
+	 *
-	if (rc == 2)
+	 * 	if (rc == 2)
-		goto EXIT;
+	 *	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-<VERSION>.tgz */
+		/* Check for ipfire-<VERSION>.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,
+	/* if (runcommandwithprogress(60, 4, title, commandstring, 4600,
-		ctr[TR_INSTALLING_FILES]))
+	 *	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__