Bugfixes:

  * Framebufferdevices
  * Bootscripts vergessen ;-)
  * Hoffentlich den Doppel-Anmelde-Fehler behoben.
  * Jetzt Tux im Konsolensplash.
  * Libjpeg in ISO enthalten.
  * Installer gefixt.

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

diff --git a/config/bootsplash/images/bootsplash-1024x768.jpg b/config/bootsplash/images/bootsplash-1024x768.jpg
index 7fc98004793bcde6bd71db7f0afb533811fcca4f..e6d5eba64660c6c187246981db5d41eb258ab32d 100644 (file)
Binary files a/config/bootsplash/images/bootsplash-1024x768.jpg and b/config/bootsplash/images/bootsplash-1024x768.jpg differ

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 805489c67cf76f46d9095ac669879f394d7e31d5..2e621fb8a330cd692a5406d112ae7ad32c8a1c61 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -721,7 +721,7 @@ sub openpage {
     my $h2 = gettitle($menu);
     my $helpuri = get_helpuri();
 
-    $title = "IPFire - $title $FIREBUILD";
+    $title = "IPFire - $title";
     if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
         $title =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; 
     }
@@ -737,8 +737,15 @@ sub openpage {
 
     $extrahead
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+END
+;
+    if ($settings{'FX'} eq 'on') {
+       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 { 
+       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>
@@ -809,7 +816,7 @@ sub closepage () {
     print <<END
          <div align="center">
             <p>
-             <div style="font-size: 9px"><b>Status:</b> $status <b>Uptime:</b>$uptime</div>
+             <div style="font-size: 9px"><b>Status:</b> $status <b>Uptime:</b>$uptime <b>Version:</b> $FIREBUILD</div> 
             </p>
           </div>
        </body>

diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf
index 9ce0e7177cbe31a86bf9a7ccb6689d4902664287..5c2c6aea6f71dd07aaffacae4429a9312970d4b0 100644 (file)
--- a/config/httpd/httpd.conf
+++ b/config/httpd/httpd.conf
@@ -1,8 +1,6 @@
 ##
 ## httpd.conf -- Apache HTTP server configuration file
 ##
-## $Id: httpd.conf,v 1.15.2.7 2005/04/16 11:40:15 rkerr Exp $
-##
 ServerType standalone
 ServerRoot /etc/httpd
 
@@ -42,7 +40,7 @@ RewriteRule .* - [F]
     Allow from all
 </Directory>
 <DirectoryMatch "/home/httpd/html/(graphs|sgraph)">
-    AuthName "Restricted"
+    AuthName "IPFire - Restricted"
     AuthType Basic
     AuthUserFile /var/ipfire/auth/users
     Require user admin
@@ -144,7 +142,7 @@ SSLLogLevel info
 <Directory /home/httpd/html/backup>
     Options None
     AllowOverride None
-    AuthName "Restricted"
+    AuthName "IPFire - Restricted"
     AuthType Basic
     AuthUserFile /var/ipfire/auth/users
     require user admin

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index d51f1fbea8539caf9fc415506f79abbaa38446dd..a50971ddafad67b9201af377dc1851a8e64dab26 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -43,7 +43,6 @@
   * bind-9.2.5
   * binutils-2.15.90.0.3
   * bison-1.875
-  * bootsplash-3.0.7
   * bootsplash-3.2
   * bridge-utils-1.1
   * busybox-0.60.5

diff --git a/lfs/initscripts b/lfs/initscripts
index 23508ab5787f867d9909fdbeb4b1314de3a60473..24dc94d999810a8b679bf90f0ac23e31771c8502 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: initscripts,v 1.6.2.2 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -69,4 +63,7 @@ $(TARGET) :
        chgrp nobody /etc/rc.d/rc.red
        chmod 4750 /etc/rc.d/rc.red
 
+       -mkdir -p /etc/boot.d
+       cp -f $(DIR_SRC)/src/boot.d/* /etc/boot.d
+
        @$(POSTBUILD)

diff --git a/lfs/makedev b/lfs/makedev
index 061309dc951b0cdf010c78e536e3e7def69fbe8e..1b8543577aab421a3d103aac54054675eb2b9532 100644 (file)
--- a/lfs/makedev
+++ b/lfs/makedev
@@ -122,8 +122,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd /dev && ln -sf fd0 floppy
 
        # Nodes for Framebuffer
-       for i in 0 1 2 3 4 5 6 7; do
-               mknod /dev/fb$i c 29 $[$i * 32]
+       for i in `seq 0 7` 12; do \
+               rm -f /dev/fb$$; \
+               mknod /dev/fb$$i c 29 $$(($$i * 32)); \
        done
 
        @$(POSTBUILD)

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 399e67f9b30327613a1c6edd6c4c312349f0cb69..919d181574c26aa62c0748c33dbd94b8b0dabf1f 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -19620,6 +19620,28 @@ usr/lib/libpng.so.3.1.2.8
 #usr/share/man/man3/libpngpf.3
 #usr/share/man/man5/png.5
 ##
+## jpegsrc.v6b
+##
+usr/bin/cjpeg
+usr/bin/djpeg
+usr/bin/jpegtran
+usr/bin/rdjpgcom
+usr/bin/wrjpgcom
+#usr/include/jconfig.h
+#usr/include/jerror.h
+#usr/include/jmorecfg.h
+#usr/include/jpeglib.h
+usr/lib/libjpeg.a
+usr/lib/libjpeg.la
+usr/lib/libjpeg.so
+usr/lib/libjpeg.so.62
+usr/lib/libjpeg.so.62.0.0
+#usr/share/man/man1/cjpeg.1
+#usr/share/man/man1/djpeg.1
+#usr/share/man/man1/jpegtran.1
+#usr/share/man/man1/rdjpgcom.1
+#usr/share/man/man1/wrjpgcom.1
+##
 ## libsafe-2.0-16
 ##
 etc/ld.so.preload
@@ -22252,6 +22274,7 @@ etc/rc.d/rc.red
 etc/rc.d/rc.sysinit
 etc/rc.d/rc.updatered
 etc/init.d
+etc/boot.d
 ##
 ## iptables-1.3.4
 ##
@@ -26586,6 +26609,7 @@ sbin/splash
 sbin/bootanim
 sbin/fbmngplay
 sbin/fbresolution
+sbin/fbtruetype
 boot/splash
 ##
 ## lcms

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 2b34d6221814e384fa44dfd3dc2a8e4c5667d284..1330b4099b9f54bc04c05127031a8f42054dcb8d 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -954,9 +954,9 @@ RESTORE:
        }
        /* Set Bootsplash */
        if ((handle = fopen("/scsidriver", "r")))
-               mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /boot/ipfirerd.img");
+               mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd.img");
        else
-               mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf > /boot/initrd.splash");
+               mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf > /harddisk/boot/initrd.splash");
        mysystem("/bin/chroot /harddisk /bin/umount -n /proc");
 #endif
 #ifdef __alpha__