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).


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

config/bootsplash/ipfire1/config/bootsplash-1024x768.cfg

@@ -0,0 +1,41 @@
+# This is a bootsplash configuration file for
+# theme PCLinuxOS LightedGrass, resolution 1024x768.
+#
+# See www.bootsplash.org for more information. 
+# Created by Chris Piek <acpiek@gmail.com>
+
+# config file version
+version=3
+
+# should the picture be displayed?
+state=1
+
+# fgcolor is the text forground color.
+# bgcolor is the text background (i.e. transparent) color.
+fgcolor=7
+bgcolor=0
+
+# (tx, ty) are the (x, y) coordinates of the text window in pixels.
+# tw/th is the width/height of the text window in pixels.
+tx=5
+ty=55
+tw=1019
+th=658
+
+# name of the picture file (full path recommended)
+jpeg=/usr/share/bootsplash/themes/pclinuxos_lightedgrass/images/bootsplash-1024x768.jpg
+silentjpeg=/usr/share/bootsplash/themes/pclinuxos_lightedgrass/images/silent-1024x768.jpg
+
+progress_enable=1
+
+# background
+#box silent noover  367 377 656 351 #000000
+box silent inter 367 378 367 350 #ffffff #ffffff #000000 #000000
+box silent       367 378 656 350 #ffffff #ffffff #000000 #000000
+# black border
+box silent         367 377 656 377 #ffffff
+box silent         367 351 656 351 #ffffff
+box silent         367 377 367 351 #ffffff
+box silent         656 377 656 351 #ffffff
+
+overpaintok=1

config/bootsplash/ipfire2/config/bootsplash-1024x768.cfg

@@ -0,0 +1,48 @@
+# This is the configuration file for the 1024x768 bootsplash picture.
+#
+# This file is necessary to specify the coordinates of the text box on
+# the splash screen.
+#
+# Comments are welcome by stepan@suse.de
+
+# config file version
+version=3
+
+# should the picture be displayed?
+state=1
+
+# fgcolor is the text forground color.
+# bgcolor is the text background (i.e. transparent) color.
+fgcolor=7
+bgcolor=0
+
+# (tx, ty) are the (x, y) coordinates of the text window in pixels.
+# tw/th is the width/height of the text window in pixels.
+tx=0
+ty=0
+tw=1024
+th=768
+
+# name of the picture file (full path recommended)
+jpeg=/etc/bootsplash/themes/Linux/images/bootsplash-1024x768.jpg
+silentjpeg=/etc/bootsplash/themes/Linux/images/silent-1024x768.jpg
+
+progress_enable=1
+
+# background
+box silent noover 204 666 820 686 #515151
+box silent inter  204 666 204 686 #b77200 #f2b700 #b77200 #f2b700
+box silent        204 666 820 686 #b77200 #f2b700 #b77200 #f2b700
+#box silent inter  204 666 204 686 #f2b700 #b77200 #b77200 #f2b700
+#box silent        204 666 820 686 #f2b700 #b77200 #b77200 #f2b700
+
+
+# black border
+box silent         204 665 820 665 #b5b5b5
+box silent         204 687 820 687 #b5b5b5
+box silent         203 665 203 687 #b5b5b5
+box silent         820 665 820 687 #b5b5b5
+
+
+overpaintok=1
+

config/grub/grub.conf

@@ -5,17 +5,17 @@ background = ffffff
 splashimage (hd0,0)/grub/ipfire.xpm.gz
 title IPFire
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=0x317 ro
+  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=0x317 splash=silent ro
   savedefault
 title IPFire SMP
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=0x317 ro
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=0x317 splash=silent ro
   savedefault
 title IPFire (ACPI enabled)
   root (hd0,0)
-  kernel /vmlinuz root=ROOT panic=10 ro
+  kernel /vmlinuz root=ROOT panic=10 vga=0x317 splash=silent ro
   savedefault
 title IPFire SMP (ACPI HT enabled)
   root (hd0,0)
-  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht ro
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=0x317 splash=silent ro
   savedefault

config/kernel/install-message

@@ -1,21 +1,21 @@
 
-        Welcome to IPFire, Licensed under GNU GPL version 2. 
+        Willkommen bei IPFire - GNU GPL version 2.
 
-        PLEASE BEWARE!  This installation process will kill all 
+        ACHTUNG! Dieser Installationsprozess l<EFBFBD>scht alle
-        existing partitions on your PC or server. Please be aware
+        vorhandenen Partitionen auf der Festplatte.
-        of this before continuing this installation.  
 
         --------------------------------------------------
-        ----                                          ----
+        ---- ALLE EXISTIERENDEN DATEN WERDEN GEL<45>SCHT ----
         ---- ALL YOUR EXISTING DATA WILL BE DESTROYED ----
-        ----                                          ----
         --------------------------------------------------
 
-        Press RETURN to boot IPFire default installation.
+        Dr<EFBFBD>cken Sie ENTER um die IPFire-Installation 
+        zu starten.
 
-        Or, if you are having trouble you can try these options....
+        Gibt es Probleme, so versuchen Sie diese Optionen...
-        Type:   nopcmcia to disable PCMCIA detection
+                nopcmcia um die PCMCIA-Detektierung 
-                nousb to disable USB detection
+                         zu deaktivieren.
-                nousborpcmcia to disable both PCMCIA & USB detection
+                nousb    um die USB-Unterst<73>tzung auszuschalten.
-                dma to enable ide dma (SiS chipset workaround)
+                nousborpcmcia schaltet USB & PCMCIA aus.
+                dma      schaltet IDE-DMA ein (SiS chipset workaround)
 

doc/ChangeLog

@@ -1,3 +1,80 @@
+------------------------------------------------------------------------
+r193 | ms | 2006-07-03 20:50:48 +0200 (Mo, 03 Jul 2006) | 5 lines
+
+Ge<EFBFBD>ndert:
+  * Umfassende Fixes beim URL-Filter. - Erfolgreich getestet.
+  * Falsche MD5-Sum in lfs/freetype
+  * Dateien in ISO geschoben und noch <20>berfl<66>ssige gel<65>scht.
+
+------------------------------------------------------------------------
+r192 | ms | 2006-07-02 13:54:34 +0200 (So, 02 Jul 2006) | 4 lines
+
+Hinzugef<EFBFBD>gt:
+  * Libs und Fonts f<>r Bootsplash
+  * Bootsplash-Binaries selber
+
+------------------------------------------------------------------------
+r191 | casemaster | 2006-07-02 11:16:40 +0200 (So, 02 Jul 2006) | 2 lines
+
+Das Build wird jetzt im Browserkopf angezeigt
+
+------------------------------------------------------------------------
+r190 | casemaster | 2006-07-02 00:15:17 +0200 (So, 02 Jul 2006) | 2 lines
+
+<EFBFBD>nderung am Linux-Kernel (BootSplash)
+
+------------------------------------------------------------------------
+r189 | casemaster | 2006-07-01 21:50:22 +0200 (Sa, 01 Jul 2006) | 3 lines
+
+Fehlende Datei f<>r Bootsplash nachgereicht.
+
+
+------------------------------------------------------------------------
+r188 | ms | 2006-07-01 16:36:04 +0200 (Sa, 01 Jul 2006) | 5 lines
+
+Ge<EFBFBD>ndert:
+  * URL-Filter gefixt.
+  * <20>berblendungen sind an- und ausschaltbar.
+  * GLIB in ISO f<>r MC.
+
+------------------------------------------------------------------------
+r187 | casemaster | 2006-07-01 13:46:39 +0200 (Sa, 01 Jul 2006) | 3 lines
+
+Fehlerbereinigung beim URL-Filter
+Anfang f<>r Bootsplash integriert
+
+------------------------------------------------------------------------
+r186 | ms | 2006-06-30 16:31:17 +0200 (Fr, 30 Jun 2006) | 3 lines
+
+Ge<EFBFBD>ndert:
+  * Leider wurden die CGIs 3x hintereinander in die Datei geschrieben. :(
+
+------------------------------------------------------------------------
+r185 | ms | 2006-06-30 16:25:35 +0200 (Fr, 30 Jun 2006) | 3 lines
+
+Hinzugef<EFBFBD>gt:
+  * URL-Filter
+
+------------------------------------------------------------------------
+r184 | ms | 2006-06-29 22:38:22 +0200 (Do, 29 Jun 2006) | 8 lines
+
+Hinzugef<EFBFBD>gt:
+  * Kernel tr<74>gt den Namen ipfire.
+  * Perl-Modul f<>r Spamassassin
+  * Web-Cyradm
+Ge<EFBFBD>ndert:
+  * Postfix kompilierte nicht mit SASL2-Support
+  * GLIB ohne NLS.
+
+------------------------------------------------------------------------
+r183 | ms | 2006-06-27 13:49:06 +0200 (Di, 27 Jun 2006) | 6 lines
+
+Hinzugef<EFBFBD>gt:
+  * Weitere Fortschritte im QoS-GUI
+  * Cyrus-Konfiguration bearbeitet.
+Update:
+  * Changelog aktualisiert
+
 ------------------------------------------------------------------------
 r182 | ms | 2006-06-24 23:57:29 +0200 (Sa, 24 Jun 2006) | 4 lines
 

lfs/bootsplash

@@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP)/Utilities && make
 	cd $(DIR_APP)/Utilities && cp -f splash /sbin
 	-mkdir -p /etc/bootsplash/themes/current
-	cd $(DIR_APP) && cp -Rf $(DIR_CONF)/bootsplash/* /etc/bootsplash/themes/current
+	cd $(DIR_APP) && cp -Rf $(DIR_CONF)/bootsplash/* /etc/bootsplash/themes
-	-find /etc/bootsplash/themes/current -name .svn -exec rm -rf {} \;
+	-find /etc/bootsplash/themes -name .svn -exec rm -rf {} \;
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

lfs/cyrusimap

@@ -122,5 +122,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	chown cyrus.mail /var/imap/socket
 	# Wenn das Dateisystem ext2 waere...
 	# cd /var/imap && chattr +S user quota user/* quota/* && chattr +S /var/spool/imap /var/spool/imap/*
+	# Give user cyrus a password
+	echo cyrus:ipfire | /usr/sbin/chpasswd
 	@rm -rf $(DIR_APP) /usr/include/com_err.h
 	@$(POSTBUILD)

make.sh

@@ -849,9 +849,11 @@ buildpackages() {
 }
 
 ipfirepackages() {
-  for i in `ls $BASEDIR/packages`; do
+  if [ -d "$BASEDIR/packages" ]; then
-	touch $BASEDIR/build/install/packages/$i.empty
+	  for i in `ls $BASEDIR/packages`; do
-  done
+		touch $BASEDIR/build/install/packages/$i.empty
+	  done
+  fi
   ipfiredist amavisd
   ipfiredist applejuice
   ipfiredist asterisk

src/ROOTFILES.i386

@@ -26583,14 +26583,7 @@ usr/lib/libfreetype.so.6.3.8
 ## bootsplash 3.0.7
 ##
 sbin/splash
-#etc/bootsplash
+etc/bootsplash
-#etc/bootsplash/themes
-#etc/bootsplash/themes/current
-#etc/bootsplash/themes/current/config
-etc/bootsplash/themes/current/config/bootsplash-1024x768.cfg
-#etc/bootsplash/themes/current/images
-etc/bootsplash/themes/current/images/bootsplash-1024x768.jpg
-etc/bootsplash/themes/current/images/silent-1024x768.jpg
 ##
 ## lcms
 ##