diff --git a/config/bootsplash/ipfire1/config/bootsplash-1024x768.cfg b/config/bootsplash/ipfire1/config/bootsplash-1024x768.cfg new file mode 100644 index 000000000..5a7068f81 --- /dev/null +++ b/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 + +# 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 diff --git a/config/bootsplash/ipfire1/images/bootsplash-1024x768.jpg b/config/bootsplash/ipfire1/images/bootsplash-1024x768.jpg new file mode 100644 index 000000000..e5cab4248 Binary files /dev/null and b/config/bootsplash/ipfire1/images/bootsplash-1024x768.jpg differ diff --git a/config/bootsplash/ipfire1/images/silent-1024x768.jpg b/config/bootsplash/ipfire1/images/silent-1024x768.jpg new file mode 100644 index 000000000..3d15f356a Binary files /dev/null and b/config/bootsplash/ipfire1/images/silent-1024x768.jpg differ diff --git a/config/bootsplash/ipfire2/config/bootsplash-1024x768.cfg b/config/bootsplash/ipfire2/config/bootsplash-1024x768.cfg new file mode 100644 index 000000000..4a30a3e48 --- /dev/null +++ b/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 + diff --git a/config/bootsplash/ipfire2/images/bootsplash-1024x768.jpg b/config/bootsplash/ipfire2/images/bootsplash-1024x768.jpg new file mode 100644 index 000000000..b091da17a Binary files /dev/null and b/config/bootsplash/ipfire2/images/bootsplash-1024x768.jpg differ diff --git a/config/bootsplash/ipfire2/images/silent-1024x768.jpg b/config/bootsplash/ipfire2/images/silent-1024x768.jpg new file mode 100644 index 000000000..9fe7cf7c7 Binary files /dev/null and b/config/bootsplash/ipfire2/images/silent-1024x768.jpg differ diff --git a/config/grub/grub.conf b/config/grub/grub.conf index 48fcd08c3..2b9b4b89f 100644 --- a/config/grub/grub.conf +++ b/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 diff --git a/config/kernel/install-message b/config/kernel/install-message index 9dd5868ef..efce1bbc2 100644 --- a/config/kernel/install-message +++ b/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 - existing partitions on your PC or server. Please be aware - of this before continuing this installation. + ACHTUNG! Dieser Installationsprozess löscht alle + vorhandenen Partitionen auf der Festplatte. -------------------------------------------------- - ---- ---- + ---- ALLE EXISTIERENDEN DATEN WERDEN GELÖSCHT ---- ---- ALL YOUR EXISTING DATA WILL BE DESTROYED ---- - ---- ---- -------------------------------------------------- - Press RETURN to boot IPFire default installation. + Drücken Sie ENTER um die IPFire-Installation + zu starten. - Or, if you are having trouble you can try these options.... - Type: nopcmcia to disable PCMCIA detection - nousb to disable USB detection - nousborpcmcia to disable both PCMCIA & USB detection - dma to enable ide dma (SiS chipset workaround) + Gibt es Probleme, so versuchen Sie diese Optionen... + nopcmcia um die PCMCIA-Detektierung + zu deaktivieren. + nousb um die USB-Unterstützung auszuschalten. + nousborpcmcia schaltet USB & PCMCIA aus. + dma schaltet IDE-DMA ein (SiS chipset workaround) diff --git a/doc/ChangeLog b/doc/ChangeLog index dcae56bcd..55f27f4d6 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,80 @@ +------------------------------------------------------------------------ +r193 | ms | 2006-07-03 20:50:48 +0200 (Mo, 03 Jul 2006) | 5 lines + +Geändert: + * Umfassende Fixes beim URL-Filter. - Erfolgreich getestet. + * Falsche MD5-Sum in lfs/freetype + * Dateien in ISO geschoben und noch überflüssige gelöscht. + +------------------------------------------------------------------------ +r192 | ms | 2006-07-02 13:54:34 +0200 (So, 02 Jul 2006) | 4 lines + +Hinzugefü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 + +Ä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ändert: + * URL-Filter gefixt. + * Ü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ä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ügt: + * URL-Filter + +------------------------------------------------------------------------ +r184 | ms | 2006-06-29 22:38:22 +0200 (Do, 29 Jun 2006) | 8 lines + +Hinzugefügt: + * Kernel trägt den Namen ipfire. + * Perl-Modul für Spamassassin + * Web-Cyradm +Geä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ü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 diff --git a/lfs/bootsplash b/lfs/bootsplash index 17fd83f52..793038bc9 100644 --- a/lfs/bootsplash +++ b/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 - -find /etc/bootsplash/themes/current -name .svn -exec rm -rf {} \; + cd $(DIR_APP) && cp -Rf $(DIR_CONF)/bootsplash/* /etc/bootsplash/themes + -find /etc/bootsplash/themes -name .svn -exec rm -rf {} \; @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/cyrusimap b/lfs/cyrusimap index 3b0aecad9..cc3b7c4f2 100644 --- a/lfs/cyrusimap +++ b/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) diff --git a/make.sh b/make.sh index b18e02c26..f898bb2a6 100644 --- a/make.sh +++ b/make.sh @@ -849,9 +849,11 @@ buildpackages() { } ipfirepackages() { - for i in `ls $BASEDIR/packages`; do - touch $BASEDIR/build/install/packages/$i.empty - done + if [ -d "$BASEDIR/packages" ]; then + for i in `ls $BASEDIR/packages`; do + touch $BASEDIR/build/install/packages/$i.empty + done + fi ipfiredist amavisd ipfiredist applejuice ipfiredist asterisk diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386 index 9126887fc..819ff6e78 100644 --- a/src/ROOTFILES.i386 +++ b/src/ROOTFILES.i386 @@ -26583,14 +26583,7 @@ usr/lib/libfreetype.so.6.3.8 ## bootsplash 3.0.7 ## sbin/splash -#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 +etc/bootsplash ## ## lcms ##