Hinzugefügt:

  * Cron-Ordner.
  * Eine Perl-Datei für den GNUmp3d hinzugefügt.
  * run-parts-Script.
Geändert:
  * Versucht das QoS kompatibel für den IE zu machen.
  * Bootsplashbar wird nichtmehr im Textmodus versucht einzublenden.

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

diff --git a/config/cron/crontab b/config/cron/crontab
index 3d59179142afa563ecc44b93b215532c4d5eb099..88e40b5d83d17e499f6b487ba02bf3e50c24211c 100644 (file)
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -6,6 +6,14 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
 MAILTO=root
 HOME=/
 
+# Do all jobs in this directories
+*/1 * * * *    test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.minutely
+*/5 * * * *    test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.cyclic
+01 * * * *     test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.hourly
+25 1 * * *     test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.daily
+47 2 * * 0     test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly
+52 3 1 * *     test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.monthly
+
 # Log rotation
 01 * * * *     /usr/sbin/logrotate /etc/logrotate.conf
 

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 136fcb3e882f632bb809ea6d82a70809e33d5df0..85cfcc631552620fa96a8bf31831a2c5e2a54abd 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -35,6 +35,7 @@
   * arping-2.05
   * as86-0.16.17
   * asterisk-1.2.9.1
+  * asterisk-1.2.9.1
   * autoconf-2.59
   * automake-1.8.4
   * bash-2.05b

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 094cd87351a048fc9ed4bc6c73e23d5e4c19e6e1..29e449ce804d943771dde689f6297b11fc868d22 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -873,13 +873,34 @@ END
                                    <td align='center' bgcolor='#EAEAEA'>$classline[4]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[5]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[6]
-                                   <td align='right'  bgcolor='#EAEAEA'><input type='hidden' name='CLASS' value='$classline[1]'>
-                                       <button type='submit' name='DOCLASS' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                       <button type='submit' name='ACTION' value='Unterklasse hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addblue.gif' width="20" height="20" alt="Unterklasse hinzufuegen"></button>&nbsp;
-                                       <button type='submit' name='ACTION' value='Level7-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addgreen.gif' width="20" height="20" alt="Level7-Regel hinzufuegen"></button>&nbsp;
-                                       <button type='submit' name='ACTION' value='Port-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/add.gif' width="20" height="20" alt="Port-Regel hinzufuegen"></button>&nbsp;
-                                       <button type='submit' name='DOCLASS' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
-                               </form>
+                                   <td align='right'  bgcolor='#EAEAEA'>
+                                       <table border='0'><tr>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]'>
+                                               <input type='hidden' name='DOCLASS' value='Bearbeiten'>
+                                               <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]'>
+                                               <input type='hidden' name='ACTION' value='Unterklasse hinzufuegen'>
+                                               <input type='image' alt='Unterklasse hinzufuegen' src='/images/addblue.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]'>
+                                               <input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
+                                               <input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]'>
+                                               <input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
+                                               <input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]'>
+                                               <input type='hidden' name='DOCLASS' value='Loeschen'>
+                                               <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                                       </form>
+                                       </table>
 END
 ;
                                foreach $subclassentry (sort @subclasses)
@@ -922,13 +943,34 @@ END
                                    <td align='center' bgcolor='#EAEAEA'>$classline[4]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[5]
                                    <td align='center' bgcolor='#EAEAEA'>$classline[6]
-                                   <td align='right'  bgcolor='#EAEAEA'><input type='hidden' name='CLASS' value='$classline[1]'>
-                                       <button type='submit' name='DOCLASS' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                       <button type='submit' name='ACTION' value='Unterklasse hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addblue.gif' width="20" height="20" alt="Unterklasse hinzufuegen"></button>&nbsp;
-                                       <button type='submit' name='ACTION' value='Level7-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/addgreen.gif' width="20" height="20" alt="Level7-Regel hinzufuegen"></button>&nbsp;
-                                       <button type='submit' name='ACTION' value='Port-Regel hinzufuegen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/add.gif' width="20" height="20" alt="Port-Regel hinzufuegen"></button>&nbsp;
-                                       <button type='submit' name='DOCLASS' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
-                               </form>
+                                   <td align='right'  bgcolor='#EAEAEA'>
+                                       <table border='0'><tr>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]'>
+                                               <input type='hidden' name='DOCLASS' value='Bearbeiten'>
+                                               <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]'>
+                                               <input type='hidden' name='ACTION' value='Unterklasse hinzufuegen'>
+                                               <input type='image' alt='Unterklasse hinzufuegen' src='/images/addblue.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]'>
+                                               <input type='hidden' name='ACTION' value='Level7-Regel hinzufuegen'>
+                                               <input type='image' alt='Level7-Regel hinzufuegen' src='/images/addgreen.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]'>
+                                               <input type='hidden' name='ACTION' value='Port-Regel hinzufuegen'>
+                                               <input type='image' alt='Port-Regel hinzufuegen' src='/images/add.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$classline[1]'>
+                                               <input type='hidden' name='DOCLASS' value='Loeschen'>
+                                               <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                                       </form>
+                                       </table>
 END
 ;
                                foreach $subclassentry (sort @subclasses)
@@ -987,16 +1029,26 @@ END
                        if ( $l7ruleline[1] eq $qossettings{'RED_DEV'} )
                        {
                                print <<END
-                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <tr><td align='center' bgcolor='#EAEAEA'>$l7ruleline[1]
                                    <td align='center' bgcolor='#EAEAEA'>$l7ruleline[0]
                                    <td align='center' bgcolor='#EAEAEA'>$l7ruleline[2]
                                    <td align='center' bgcolor='#EAEAEA'>$l7ruleline[3]
                                    <td align='center' bgcolor='#EAEAEA'>$l7ruleline[4]
-                                   <td align='right'  bgcolor='#EAEAEA'><input type='hidden' name='CLASS' value='$l7ruleline[0]'><input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
-                                       <button type='submit' name='DOLEVEL7' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                       <button type='submit' name='DOLEVEL7' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
-                               </form>
+                                   <td align='right'  bgcolor='#EAEAEA'>
+                                       <table border='0'><tr>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$l7ruleline[0]'>
+                                               <input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
+                                               <input type='hidden' name='DOLEVEL7' value='Bearbeiten'>
+                                               <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$l7ruleline[0]'>
+                                               <input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
+                                               <input type='hidden' name='DOLEVEL7' value='Loeschen'>
+                                               <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                                       </form>
+                                       </table>
 END
 ;
                        }
@@ -1014,10 +1066,21 @@ END
                                    <td align='center' bgcolor='#EAEAEA'>$l7ruleline[2]
                                    <td align='center' bgcolor='#EAEAEA'>$l7ruleline[3]
                                    <td align='center' bgcolor='#EAEAEA'>$l7ruleline[4]
-                                   <td align='right'  bgcolor='#EAEAEA'><input type='hidden' name='CLASS' value='$l7ruleline[0]'><input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
-                                       <button type='submit' name='DOLEVEL7' value='Bearbeiten' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/edit.gif' width="20" height="20" alt="Klasse bearbeiten"></button>&nbsp;
-                                       <button type='submit' name='DOLEVEL7' value='Loeschen' class='btnOff' onmouseover='BorderOn(this)' onmouseout='BorderOff(this)'><img src='/images/delete.gif' width="20" height="20" alt="Klasse loeschen"></button>
-                               </form>
+                                   <td align='right'  bgcolor='#EAEAEA'>
+                                       <table border='0'><tr>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$l7ruleline[0]'>
+                                               <input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
+                                               <input type='hidden' name='DOLEVEL7' value='Bearbeiten'>
+                                               <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
+                                       </form>
+                                       <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='CLASS' value='$l7ruleline[0]'>
+                                               <input type='hidden' name='L7PROT' value='$l7ruleline[2]'>
+                                               <input type='hidden' name='DOLEVEL7' value='Loeschen'>
+                                               <input type='image' alt='Loeschen' src='/images/delete.gif'>
+                                       </form>
+                                       </table>
 END
 ;
                        }

diff --git a/lfs/fcron b/lfs/fcron
index 4bf0420d4e85c26902a62bb023284c1101a386b7..4f2589fb699d61e350f989c49548c2106618f459 100644 (file)
--- a/lfs/fcron
+++ b/lfs/fcron
@@ -87,6 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        echo "root" > /etc/fcron.allow
        echo "all"  > /etc/fcron.deny
        chmod u-s /usr/bin/fcrontab /usr/bin/fcronsighup
+       mkdir -p /etc/fcron.minutely /etc/fcron.cyclic /etc/fcron.hourly \
+               /etc/fcron.daily /etc/fcron.weekly /etc/fcron.monthly
        /usr/bin/fcrontab $(DIR_SRC)/config/cron/crontab
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index b469d1c5f653bdc971a698b1b3cd7efcc784cd82..3ac7cd3371018f0f7ba1724deea85dbc205a9721 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -1377,6 +1377,7 @@ usr/local/bin/rcgnump3d
 usr/local/bin/rcnfs-server
 usr/local/bin/rcpostfix
 usr/local/bin/rcwinbind
+usr/local/bin/run-parts
 #usr/local/doc
 #usr/local/etc
 #usr/local/include
@@ -14138,6 +14139,7 @@ usr/lib/perl5/5.8.5/unicore/Name.pl
 #usr/lib/perl5/5.8.5/unicore/PropValueAliases.txt
 #usr/lib/perl5/5.8.5/unicore/Properties
 #usr/lib/perl5/5.8.5/unicore/PropertyAliases.txt
+usr/lib/perl5/5.8.5/unicore/PVA.pl
 #usr/lib/perl5/5.8.5/unicore/README.perl
 #usr/lib/perl5/5.8.5/unicore/ReadMe.txt
 #usr/lib/perl5/5.8.5/unicore/Scripts.txt

diff --git a/src/rc.d/rc.halt b/src/rc.d/rc.halt
index 9c8c7a66f143a9dc6c8449404d7e5405a0d427a5..5661959acb03fd3a576761630c9a6fa1e64f67df 100644 (file)
--- a/src/rc.d/rc.halt
+++ b/src/rc.d/rc.halt
@@ -10,11 +10,15 @@ progressbar()
                        echo "Usage: progressbar {progress}"
                        exit 1
                fi
-       echo "show $(( 65534 * $1 / 9 ))" > /proc/splash
+       if [ -e /proc/splash ]; then
+               echo "show $(( 65534 * $1 / 9 ))" > /proc/splash
+       fi
 }
 # Set bootsplash
 progressbar 9
-echo "silent" > /proc/splash
+if [ -e /proc/splash ]; then
+       echo "silent" > /proc/splash
+fi
 
 echo "Stopping the RED interface..."
 progressbar 8

diff --git a/src/rc.d/rc.sysinit b/src/rc.d/rc.sysinit
index 77660504aec650f10f3f5a2eb3eb76f1e248bbc6..1524f995fbb1402249d66b807e0832bd41329e7c 100644 (file)
--- a/src/rc.d/rc.sysinit
+++ b/src/rc.d/rc.sysinit
@@ -19,7 +19,9 @@ progressbar()
                        echo "Usage: progressbar {progress}"
                        exit 1
                fi
-       echo "show $(( 65534 * $1 / $NUMBEROFSCRIPTS ))" > /proc/splash
+       if [ -e /proc/splash ]; then
+               echo "show $(( 65534 * $1 / $NUMBEROFSCRIPTS ))" > /proc/splash
+       fi
 }
 
 echo "Mounting /proc filesystem"

diff --git a/src/scripts/run-parts b/src/scripts/run-parts
new file mode 100644 (file)
index 0000000..dd6b59b
--- /dev/null
+++ b/src/scripts/run-parts
@@ -0,0 +1,49 @@
+#!/bin/sh
+# run-parts:  Runs all the scripts found in a directory.
+
+# keep going when something fails
+set +e
+
+if [ $# -lt 1 ]; then
+  echo "Usage: run-parts <directory>"
+  exit 1
+fi
+
+if [ ! -d $1 ]; then
+  echo "Not a directory: $1"
+  echo "Usage: run-parts <directory>"
+  exit 1
+fi
+
+# There are several types of files that we would like to
+# ignore automatically, as they are likely to be backups
+# of other scripts:
+IGNORE_SUFFIXES="~ ^ , .bak .new .rpmsave .rpmorig .rpmnew .swp"
+
+# Main loop:
+for SCRIPT in $1/* ; do
+  # If this is not a regular file, skip it:
+  if [ ! -f $SCRIPT ]; then
+    continue
+  fi
+  # Determine if this file should be skipped by suffix:
+  SKIP=false
+  for SUFFIX in $IGNORE_SUFFIXES ; do
+    if [ ! "`basename $SCRIPT $SUFFIX`" = "`basename $SCRIPT`" ]; then
+      SKIP=true
+      break
+    fi
+  done
+  if [ "$SKIP" = "true" ]; then
+    continue
+  fi
+  # If we've made it this far, then run the script if it's executable:
+  if [ -x $SCRIPT ]; then
+    echo "$SCRIPT:"
+    echo
+    $SCRIPT 2>&1
+    echo
+  fi
+done
+
+exit 0