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

Geaendert:

Browse Source 
* Kernel-Multicast entfernt.
  * MC-Downgrade.
  * Etherwake gefixt.
  * Shutdown-Balken umgekehrt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@216 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
delaco
2006-07-21 15:10:50 +00:00
parent 72586b9fe6
commit 20e891c64a
10 changed files with 38 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
config/grub/grub.conf
View File

@@ -8,14 +8,9 @@ title IPFire (1024x768)
kernel /vmlinuz root=ROOT panic=10 acpi=off vga=791 splash=silent ro
initrd /initrd.splash
savedefault
title IPFire (800x600)
title IPFire (640x480)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 acpi=off vga=788 splash=silent ro
initrd /initrd.splash
savedefault
title IPFire (text)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 acpi=off ro
kernel /vmlinuz root=ROOT panic=10 acpi=off vga=785 splash=silent ro
initrd /initrd.splash
savedefault
title IPFire SMP (1024x768)
@@ -23,14 +18,9 @@ title IPFire SMP (1024x768)
kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
initrd /initrd.splash
savedefault
title IPFire SMP (800x600)
title IPFire SMP (640x480)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=788 splash=silent ro
initrd /initrd.splash
savedefault
title IPFire SMP (text)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 acpi=off ro
kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=785 splash=silent ro
initrd /initrd.splash
savedefault
title IPFire (ACPI enabled) (1024x768)
@@ -38,14 +28,9 @@ title IPFire (ACPI enabled) (1024x768)
kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
initrd /initrd.splash
savedefault
title IPFire (ACPI enabled) (800x600)
title IPFire (ACPI enabled) (640x480)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 vga=788 splash=silent ro
initrd /initrd.splash
savedefault
title IPFire (ACPI enabled) (text)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 ro
kernel /vmlinuz root=ROOT panic=10 vga=785 splash=silent ro
initrd /initrd.splash
savedefault
title IPFire SMP (ACPI HT enabled) (1024x768)
@@ -53,13 +38,8 @@ title IPFire SMP (ACPI HT enabled) (1024x768)
kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
initrd /initrd.splash
savedefault
title IPFire SMP (ACPI HT enabled) (800x600)
title IPFire SMP (ACPI HT enabled) (640x480)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=788 splash=silent ro
initrd /initrd.splash
savedefault
title IPFire SMP (ACPI HT enabled) (text)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht ro
kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=785 splash=silent ro
initrd /initrd.splash
savedefault

36
config/grub/scsigrub.conf
View File

@@ -8,14 +8,9 @@ title IPFire (1024x768)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
initrd /ipfirerd.img
savedefault
title IPFire (800x600)
title IPFire (640x480)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=788 splash=silent rw
initrd /ipfirerd.img
savedefault
title IPFire (text)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off rw
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=785 splash=silent rw
initrd /ipfirerd.img
savedefault
title IPFire SMP (1024x768)
@@ -23,14 +18,9 @@ title IPFire SMP (1024x768)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
initrd /ipfirerd-smp.img
savedefault
title IPFire SMP (800x600)
title IPFire SMP (640x480)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=788 splash=silent rw
initrd /ipfirerd-smp.img
savedefault
title IPFire SMP (text)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off rw
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=785 splash=silent rw
initrd /ipfirerd-smp.img
savedefault
title IPFire (ACPI enabled) (1024x768)
@@ -38,14 +28,9 @@ title IPFire (ACPI enabled) (1024x768)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=791 splash=silent rw
initrd /ipfirerd.img
savedefault
title IPFire (ACPI enabled) (800x600)
title IPFire (ACPI enabled) (640x480)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=788 splash=silent rw
initrd /ipfirerd.img
savedefault
title IPFire (ACPI enabled) (text)
root (hd0,0)
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc rw
kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=785 splash=silent rw
initrd /ipfirerd.img
savedefault
title IPFire SMP (ACPI HT enabled) (1024x768)
@@ -53,13 +38,8 @@ title IPFire SMP (ACPI HT enabled) (1024x768)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=791 splash=silent rw
initrd /ipfirerd-smp.img
savedefault
title IPFire SMP (ACPI HT enabled) (800x600)
title IPFire SMP (ACPI HT enabled) (640x480)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=788 splash=silent rw
initrd /ipfirerd-smp.img
savedefault
title IPFire SMP (ACPI HT enabled) (text)
root (hd0,0)
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht rw
kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=785 splash=silent rw
initrd /ipfirerd-smp.img
savedefault

7
config/kernel/kernel.config.i386
View File

@@ -216,7 +216,7 @@ CONFIG_NETFILTER=y
CONFIG_FILTER=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
# CONFIG_IP_MULTICAST is not set
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
# CONFIG_IP_ROUTE_FWMARK is not set
@@ -225,11 +225,8 @@ CONFIG_IP_ROUTE_MULTIPATH=y
CONFIG_IP_ROUTE_TOS=y
CONFIG_IP_ROUTE_VERBOSE=y
# CONFIG_IP_PNP is not set
CONFIG_NET_IPIP=y
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
CONFIG_IP_MROUTE=y
# CONFIG_IP_PIMSM_V1 is not set
# CONFIG_IP_PIMSM_V2 is not set
# CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set
CONFIG_SYN_COOKIES=y

7
config/kernel/kernel.config.i386.smp
View File

@@ -205,7 +205,7 @@ CONFIG_NETFILTER=y
CONFIG_FILTER=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
# CONFIG_IP_MULTICAST is not set
CONFIG_IP_ADVANCED_ROUTER=y
CONFIG_IP_MULTIPLE_TABLES=y
# CONFIG_IP_ROUTE_FWMARK is not set
@@ -214,11 +214,8 @@ CONFIG_IP_ROUTE_MULTIPATH=y
CONFIG_IP_ROUTE_TOS=y
CONFIG_IP_ROUTE_VERBOSE=y
# CONFIG_IP_PNP is not set
CONFIG_NET_IPIP=y
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
CONFIG_IP_MROUTE=y
# CONFIG_IP_PIMSM_V1 is not set
# CONFIG_IP_PIMSM_V2 is not set
# CONFIG_ARPD is not set
# CONFIG_INET_ECN is not set
CONFIG_SYN_COOKIES=y

BIN
html/html/images/urlfilter/background.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 775 B

6
html/html/redirect.cgi
View File

@@ -1,7 +1,7 @@
#!/usr/bin/perl
#
# $Id: redirect.cgi,v 0.2 2006/06/12 00:00:00 modyfy bye linuxadmin
# $Id: redirect.cgi,v 0.3 2006/07/18 00:00:00 modyfy bye linuxadmin
#
use CGI qw(param);
@@ -47,10 +47,10 @@ print <<END
END
;
if (($filtersettings{'ENABLE_JPEG'} eq 'on') && (-e "/home/httpd/html/images/urlfilter/background.jpg"))
if (($filtersettings{'ENABLE_JPEG'} eq 'on') && (-e "/home/httpd/html/images/urlfilter/logo_ipfire.gif"))
{
print <<END
<body background="http://$netsettings{'GREEN_ADDRESS'}:81//images/urlfilter/background.jpg" bgcolor="#FFFFFF">
<body background="http://$netsettings{'GREEN_ADDRESS'}:81//images/urlfilter/logo_ipfire.gif" bgcolor="#FFFFFF">
END
;
} else {

2
lfs/configroot
View File

@@ -62,7 +62,7 @@ $(TARGET) :
dhcp/fixleases dhcp/advoptions dmzholes/config ethernet/aliases ethernet/settings \
isdn/settings main/hosts main/settings optionsfw/settings outgoing/settings outgoing/rules pakfire/settings \
portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
ppp/settings-5 ppp/settings proxy/advanced/settings remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
snort/settings vpn/config vpn/settings vpn/ipsec.conf \
vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
touch $(CONFIG_ROOT)/$$i; \

11
lfs/mc
View File

@@ -32,11 +32,11 @@
include Config
VER = 4.6.1
VER = 4.6.0
THISAPP = mc-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = http://www.ibiblio.org/pub/Linux/utils/file/managers/mc
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 18b20db6e40480a53bac2870c56fc3c4
$(DL_FILE)_MD5 = 70804dc9e2049e24f294ff7090a82a12
install : $(TARGET)
@@ -81,10 +81,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure --prefix=/usr --with-screen=mcslang --without-x --disable-nls --with-samba
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
# mv /usr/bin/mc /usr/bin/mcc
# echo -e "#!/bin/bash" > /usr/bin/mc
# echo -e "# Start MC in color-mode" >> /usr/bin/mc
# echo -e "/usr/bin/mcc -c" >> /usr/bin/mc
# chmod 755 /usr/bin/mc
@rm -rf $(DIR_APP)
@$(POSTBUILD)

2
src/misc-progs/launch-ether-wake.c
View File

@@ -26,7 +26,7 @@ int main(int argc, char *argv[])
if (!(initsetuid()))
exit(1);
snprintf(command, BUFFER_SIZE-1, "/usr/bin/ether-wake -i %s %s", argv[2], argv[1]);
snprintf(command, BUFFER_SIZE-1, "/usr/sbin/etherwake -i %s %s", argv[2], argv[1]);
safe_system(command);
return(0);

20
src/rc.d/rc.halt
View File

@@ -13,46 +13,46 @@ progressbar()
echo "show $(( 65534 * $1 / 9 ))" > /proc/splash
}
# Set bootsplash
progressbar 0
progressbar 9
echo "silent" > /proc/splash
echo "Stopping the RED interface..."
progressbar 1
progressbar 8
/etc/rc.d/rc.red stop 2>/dev/null
/etc/rc.d/rc.red clear 2>/dev/null
echo "Shutting down..."
progressbar 2
progressbar 7
sleep 3
echo "Saving the clock"
progressbar 3
progressbar 6
/sbin/hwclock --systohc
echo "Sending all processes the TERM signal..."
progressbar 4
progressbar 5
/sbin/killall5 -15
sleep 3
echo "Sending all processes the KILL signal..."
progressbar 5
progressbar 4
/sbin/killall5 -9
sleep 3
echo "Turning off swap"
progressbar 6
progressbar 3
swapoff -a
echo "Unmounting others"
progressbar 7
progressbar 2
umount -n -a
echo "Unmounting root"
progressbar 8
progressbar 1
mount -n -o remount,ro /
# Send nice shutdown beep now
progressbar 9
progressbar 0
/usr/bin/beep -l 75 -f 3000
/usr/bin/beep -l 75 -f 2000
/usr/bin/beep -l 75 -f 1000