Geaendert:

  * 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

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 8c2152caa665fcefdb5827c0560b5fd3e5fded92..ff9af0b3c606c309ec8ececb48d56d2ce3e188b4 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -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)
-  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)
+title IPFire SMP (640x480)
   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)
-  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)
+title IPFire SMP (ACPI HT enabled) (640x480)
   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

diff --git a/config/grub/scsigrub.conf b/config/grub/scsigrub.conf
index e0c601efac5897c95936bd4a0d086fa7bc929531..13a850a183284ecd521a9d2aff8cd6259221fc93 100644 (file)
--- a/config/grub/scsigrub.conf
+++ b/config/grub/scsigrub.conf
@@ -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)
-  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)
+title IPFire SMP (640x480)
   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)
-  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)
+title IPFire SMP (ACPI HT enabled) (640x480)
   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

diff --git a/config/kernel/kernel.config.i386 b/config/kernel/kernel.config.i386
index 9c2a7032b71cd704578f5ab668981acc578d7414..36c7dc97ca02da7f743174b9a8602a5384e53b70 100644 (file)
--- a/config/kernel/kernel.config.i386
+++ b/config/kernel/kernel.config.i386
@@ -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

diff --git a/config/kernel/kernel.config.i386.smp b/config/kernel/kernel.config.i386.smp
index e0cc55eaa64f173bc209886a21e89b93d77a24ce..0bdd21c10549a28c352377cd8e824edee39250b9 100644 (file)
--- a/config/kernel/kernel.config.i386.smp
+++ b/config/kernel/kernel.config.i386.smp
@@ -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

diff --git a/html/html/images/urlfilter/background.jpg b/html/html/images/urlfilter/background.jpg
deleted file mode 100644 (file)
index 9520c38..0000000
Binary files a/html/html/images/urlfilter/background.jpg and /dev/null differ

diff --git a/html/html/redirect.cgi b/html/html/redirect.cgi
index 6d3aca85b923b2db4abedc1347052f0b4f8543ed..0be18ed2b3f6585365eee256a56a9f09b819fdfb 100644 (file)
--- a/html/html/redirect.cgi
+++ b/html/html/redirect.cgi
@@ -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 {

diff --git a/lfs/configroot b/lfs/configroot
index 46837f033e7ff4eeb6c5ef15c1caba4e9656e80c..35c8a03937b2163a3bf05b3c9aca3be125f9bed8 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -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; \

diff --git a/lfs/mc b/lfs/mc
index 35b29e2edd51ba0042de921ed7152b0e9a2db573..96d6308a7be2a4556c3609257e0fd6924e21f001 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -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)

diff --git a/src/misc-progs/launch-ether-wake.c b/src/misc-progs/launch-ether-wake.c
index 703ace7a671499c466c02840cb58881a9189b250..f487041db9441b95b78ba51967c616c35c7a03ca 100644 (file)
--- a/src/misc-progs/launch-ether-wake.c
+++ b/src/misc-progs/launch-ether-wake.c
@@ -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);

diff --git a/src/rc.d/rc.halt b/src/rc.d/rc.halt
index 7dd33567bce82ca36e1b7578edc2eae1ab47bd21..9c8c7a66f143a9dc6c8449404d7e5405a0d427a5 100644 (file)
--- a/src/rc.d/rc.halt
+++ b/src/rc.d/rc.halt
@@ -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