webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes:

Browse Source 
* 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
This commit is contained in:
ms
2006-07-06 20:15:31 +00:00
parent 909d1ed785
commit 6693216e1e
8 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
config/bootsplash/images/bootsplash-1024x768.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 18 KiB

11
config/cfgroot/header.pl
View File

@@ -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>

6
config/httpd/httpd.conf
View File

@@ -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

1
doc/packages-list.txt
View File

@@ -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

9
lfs/initscripts
View File

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

5
lfs/makedev
View File

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

24
src/ROOTFILES.i386
View File

@@ -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

4
src/install+setup/install/main.c
View File

@@ -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__