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

Hinzugefügt:

Browse Source 
* qos.cgi - Geht noch so gut wie nix.
Geändert:
  * hddshutdown funktioniert nun.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@176 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-06-14 10:10:01 +00:00
parent a8b159e729
commit 904a41b91c
7 changed files with 199 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ROOTFILES.i386
View File

@@ -1354,8 +1354,9 @@ tmp
#usr/local
#usr/local/bin
usr/local/bin/httpscert
usr/local/bin/hddshutdown
usr/local/bin/hddshutdown-state
usr/local/bin/makegraphs
#usr/local/bin/make-packages.sh
usr/local/bin/readhash
usr/local/bin/setddns.pl
usr/local/bin/setreservedports
@@ -21014,6 +21015,7 @@ home/httpd/cgi-bin/iptables.cgi
home/httpd/cgi-bin/fwhits.cgi
home/httpd/cgi-bin/ovpnfunc.pl
home/httpd/cgi-bin/ovpnmain.cgi
home/httpd/cgi-bin/qos.cgi
#home/httpd/cgi-bin/logs.cgi
home/httpd/cgi-bin/logs.cgi/config.dat
home/httpd/cgi-bin/logs.cgi/firewalllog.dat

54
src/rc.d/rc.sysinit
View File

@@ -234,38 +234,26 @@ dmesg > /var/log/dmesg
echo 7200 > /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_established
#if [ -e /var/log/rrd/disk.rrd ]; then
# echo "Adjusting graphs to compensate for boot"
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk.rrd","-t","readsect:writesect","N:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hda.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hda.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdb.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdb.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdc.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdc.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdd.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdd.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hde.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hde.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdf.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdf.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdg.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdg.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /var/log/rrd/disk-hdh.rrd ]; then
# /usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdh.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'
#fi
#if [ -e /tmp/hddshutdown-stat ] ; then
# rm /tmp/hddshutdown-*"
#fi
#/usr/local/bin/hddshutdown
if [ -e /var/log/rrd/disk.rrd ]; then echo "Adjusting graphs to compensate for boot"; \
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk.rrd","-t","readsect:writesect","N:U:U");'; fi
if [ -e /var/log/rrd/disk-hda.rrd ]; then \
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hda.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'; fi
if [ -e /var/log/rrd/disk-hdb.rrd ]; then \
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdb.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'; fi
if [ -e /var/log/rrd/disk-hdc.rrd ]; then \
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdc.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'; fi
if [ -e /var/log/rrd/disk-hdd.rrd ]; then \
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdd.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'; fi
if [ -e /var/log/rrd/disk-hde.rrd ]; then \
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hde.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'; fi
if [ -e /var/log/rrd/disk-hdf.rrd ]; then \
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdf.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'; fi
if [ -e /var/log/rrd/disk-hdg.rrd ]; then \
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdg.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'; fi
if [ -e /var/log/rrd/disk-hdh.rrd ]; then \
/usr/bin/perl -e 'use RRDs;RRDs::update("/var/log/rrd/disk-hdh.rrd","-t","readsect:writesect:sleeping","N:U:U:U");'; fi
rm -rf /tmp/hddshutdown-*
/usr/local/bin/hddshutdown
echo "Starting crond"
/usr/sbin/fcron
@@ -280,7 +268,7 @@ echo "Starting sshd (if enabled)"
echo "Starting ntpd (if enabled)"
/usr/local/bin/restartntpd
echo "Starting openvpn (if enabled)"
/usr/local/bin/openvpnctrl --start-daemon-only
/usr/local/bin/openvpnctrl --start-daemon-only >& /dev/null
if [ -e "/var/ipfire/proxy/squid.conf" ]; then
echo "Starting squid (if enabled)"

2
src/scripts/hddshutdown
View File

@@ -70,7 +70,7 @@ sub shutdown_hdd {
close (STAT);
if (! ($lastsleepstate==$readwritereq)) {
system("hdparm -y $hdddev");
system("logger -t ipcop Shuting down $hdddev !");
system("logger -t ipfire Shuting down $hdddev !");
system("echo $readwritereq > /tmp/hddshutdown-$hdd");
}
}