diff --git a/config/bootsplash/images/bootsplash-1024x768.jpg b/config/bootsplash/images/bootsplash-1024x768.jpg index 7fc980047..e6d5eba64 100644 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 805489c67..2e621fb8a 100644 --- 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 +END +; + if ($settings{'FX'} eq 'on') { + print < + } else { + print < @@ -809,7 +816,7 @@ sub closepage () { print <

-

Status: $status Uptime:$uptime
+
Status: $status Uptime:$uptime Version: $FIREBUILD

diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf index 9ce0e7177..5c2c6aea6 100644 --- 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 - AuthName "Restricted" + AuthName "IPFire - Restricted" AuthType Basic AuthUserFile /var/ipfire/auth/users Require user admin @@ -144,7 +142,7 @@ SSLLogLevel info 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 d51f1fbea..a50971dda 100644 --- 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 23508ab57..24dc94d99 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -18,12 +18,6 @@ # Makefiles are based on LFSMake, which is # # Copyright (C) 2002 Rod Roard # # # -# 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 061309dc9..1b8543577 100644 --- 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 399e67f9b..919d18157 100644 --- 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 2b34d6221..1330b4099 100644 --- 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__