proc /proc proc defaults 0 0
sysfs /sys sysfs defaults 0 0
devpts /dev/pts devpts gid=4,mode=620 0 0
-none /tmp tmpfs defaults,size=128M 0 0
+#none /tmp tmpfs defaults 0 0
none /var/log/rrd tmpfs defaults,size=64M 0 0
none /var/lock tmpfs defaults,size=16M 0 0
none /var/run tmpfs defaults,size=16M 0 0
--- /dev/null
+usr/local/bin/7z
+usr/local/lib/p7zip
+#usr/local/lib/p7zip/7z
+#usr/local/lib/p7zip/7z.so
+#usr/local/lib/p7zip/Codecs
+#usr/local/lib/p7zip/Codecs/Rar29.so
+#usr/local/man/man1/7z.1
+#usr/local/man/man1/7za.1
+#usr/local/man/man1/7zr.1
+#usr/local/share/doc/p7zip
+#usr/local/share/doc/p7zip/ChangeLog
+#usr/local/share/doc/p7zip/DOCS
+#usr/local/share/doc/p7zip/DOCS/7zC.txt
+#usr/local/share/doc/p7zip/DOCS/7zFormat.txt
+#usr/local/share/doc/p7zip/DOCS/License.txt
+#usr/local/share/doc/p7zip/DOCS/MANUAL
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/add.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/bench.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/delete.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract_full.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/index.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/list.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/style.css
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/test.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/update.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/exit_codes.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/index.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/style.css
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_exclude.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_include.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_no.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/charset.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/exclude.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/include.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/index.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/list_tech.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/method.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/output_dir.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/overwrite.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/password.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/recurse.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/sfx.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ssc.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdin.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdout.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stop_switch.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/style.css
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/type.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/update.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/volume.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/working_dir.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/yes.htm
+#usr/local/share/doc/p7zip/DOCS/MANUAL/syntax.htm
+#usr/local/share/doc/p7zip/DOCS/Methods.txt
+#usr/local/share/doc/p7zip/DOCS/copying.txt
+#usr/local/share/doc/p7zip/DOCS/history.txt
+#usr/local/share/doc/p7zip/DOCS/lzma.txt
+#usr/local/share/doc/p7zip/DOCS/readme.txt
+#usr/local/share/doc/p7zip/DOCS/unRarLicense.txt
+#usr/local/share/doc/p7zip/README
etc/linuxigd/gatedesc.xml
usr/local/bin/getiptstate
usr/local/bin/makegraphs
+usr/local/bin/hddshutdown
usr/local/bin/squidctrl
usr/local/bin/setddns.pl
srv/web/ipfire/cgi-bin/backup.cgi
# Update fstab
#
grep -v "tmpfs" /etc/fstab > /tmp/fstab.tmp
-echo "none /tmp tmpfs defaults,size=128M 0 0" >> /tmp/fstab.tmp
+echo "#none /tmp tmpfs defaults 0 0" >> /tmp/fstab.tmp
echo "none /var/log/rrd tmpfs defaults,size=64M 0 0" >> /tmp/fstab.tmp
echo "none /var/lock tmpfs defaults,size=16M 0 0" >> /tmp/fstab.tmp
echo "none /var/run tmpfs defaults,size=16M 0 0" >> /tmp/fstab.tmp
my $disk = $_[0];
chomp $disk;
my @status;
- if (-e "/tmp/hddstatus"){
- open(DATEI, "</tmp/hddstatus") || die "Datei nicht gefunden";
+ if (-e "/var/run/hddstatus"){
+ open(DATEI, "</var/run/hddstatus") || die "Datei nicht gefunden";
my @diskstate = <DATEI>;
close(DATEI);
}
if ( $status[1]=~/standby/){
- my $ftime = localtime((stat("/tmp/hddshutdown-$disk"))[9]);
+ my $ftime = localtime((stat("/var/run/hddshutdown-$disk"))[9]);
print"<B>Disk $disk status:<font color=#FF0000>".$status[1]."</font></B> (since $ftime)";
}else{
print"<B>Disk $disk status:<font color=#00FF00>".$status[1]."</font></B>";
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 4.58
+
+THISAPP = p7zip_$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = 7zip
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 315b184102c17c4956f53218d973222d
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && make 7z $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
-VERSION="2.3-beta4"
+VERSION="2.3-test"
GIT_BRANCH=master:master # Version number
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
ipfiremake v4l-dvb KVER=2.6.25.17
ipfiremake madwifi KVER=2.6.25.17
ipfiremake alsa KMOD=1 KVER=2.6.25.17
+# ipfiremake openswan KMOD=1 KVER=2.6.25.17
ipfiremake linux
ipfiremake atl2
ipfiremake r8168
ipfiremake apcupsd
ipfiremake iperf
ipfiremake netcat
+ ipfiremake 7zip
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
foreach (@devices){
chomp $_;
my @array = split(/\//,$_);
- $diskstats = `cat /tmp/hddstats-$array[$#array]`;
+ $diskstats = `cat /var/run/hddstats-$array[$#array]`;
chomp $diskstats;
$newdiskstats = `iostat -d -t $_ | tail -2 | head -1 | awk '{ print \$5","\$6}'`;
chomp $newdiskstats;
chomp $status;
if ($debug){print "Device ".$_." IDE Power status:".$status."\n";}
- if (-e "/tmp/hddshutdown-$array[$#array]" && $status !~/standby/)
+ if (-e "/var/run/hddshutdown-$array[$#array]" && $status !~/standby/)
{
if ($debug){print "Remove wrong standby marking\n";}
- if ( -e "/tmp/hddshutdown-$array[$#array]" ) { system("unlink /tmp/hddshutdown-$array[$#array]"); }
+ if ( -e "/var/run/hddshutdown-$array[$#array]" ) { system("unlink /var/run/hddshutdown-$array[$#array]"); }
}
if ($debug){print "Device ".$_." has ".$newdiskstats." write and read Requests, was ".$diskstats." at last run.\n";}
- if ($diskstats eq $newdiskstats && (! -e "/tmp/hddshutdown-$array[$#array]") )
+ if ($diskstats eq $newdiskstats && (! -e "/var/run/hddshutdown-$array[$#array]") )
{
if ($debug){print "Setting Device ".$_." to standby ... ";}
$status = `hdparm -y /dev/$_ 2>&1`;
if ($status !~/Invalid/)
{
if ($debug){print "OK\n";}
- system("touch /tmp/hddshutdown-$array[$#array]");
+ system("touch /var/run/hddshutdown-$array[$#array]");
}
else
{
if ($diskstats ne $newdiskstats)
{
if ($debug){print "Device ".$_." is active.\n";}
- if ( -e "/tmp/hddshutdown-$array[$#array]" ) { system("unlink /tmp/hddshutdown-$array[$#array]"); }
+ if ( -e "/var/run/hddshutdown-$array[$#array]" ) { system("unlink /var/run/hddshutdown-$array[$#array]"); }
}
- system("echo $newdiskstats > /tmp/hddstats-$array[$#array]");
+ system("echo $newdiskstats > /var/run/hddstats-$array[$#array]");
}
# end
print "Error in RRD::create for hddshutdown-".$array[$#array].": $ERROR\n" if $ERROR;
}
- if (-e "/tmp/hddshutdown-".$array[$#array]) {$standby = 1;}
+ if (-e "/var/run/hddshutdown-".$array[$#array]) {$standby = 1;}
else {$standby = 0;}
RRDs::update ("$mainsettings{'RRDLOG'}/hddshutdown-".$array[$#array].".rrd", "-t", "standby", "N:$standby");
if (!$standby){
$temp = 0;
my $smart_output = '';
- system("$path_smartctl -iHA -d ata /dev/$disk > /tmp/smartctl_out_hddtemp-$disk");
- if ( -e "/tmp/smartctl_out_hddtemp-".$array[$#array] ){
- my $hdd_output = `cat /tmp/smartctl_out_hddtemp-$array[$#array] | grep Temperature_`;
+ system("$path_smartctl -iHA -d ata /dev/$disk > /var/run/smartctl_out_hddtemp-$disk");
+ if ( -e "/var/run/smartctl_out_hddtemp-".$array[$#array] ){
+ my $hdd_output = `cat /var/run/smartctl_out_hddtemp-$array[$#array] | grep Temperature_`;
my @t = split(/\s+/,$hdd_output);
$temp = $t[9];
}else{$temp = 0;}
system ('/usr/bin/vnstat -u');
my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
-system("unlink /tmp/hddstatus && touch /tmp/hddstatus");
+system("unlink /var/run/hddstatus && touch /var/run/hddstatus");
foreach (@disks){
my $disk = $_;
chomp $disk;
my $newdiskstats = "";
my @array = split(/\//,$disk);
- $diskstats = `cat /tmp/hddstats-$array[$#array]`;
+ $diskstats = `cat /var/run/hddstats-$array[$#array]`;
chomp $diskstats;
my $newdiskstats = `/usr/bin/iostat -d -t $disk | tail -2 | head -1 | awk '{ print \$5","\$6}'`;
chomp $newdiskstats;
chomp $status;
if ($status !~/standby/ || $diskstats ne $newdiskstats){
- if (-e "/tmp/hddshutdown-".$array[$#array]){system("unlink /tmp/hddshutdown-".$array[$#array]);}
+ if (-e "/var/run/hddshutdown-".$array[$#array]){system("unlink /var/run/hddshutdown-".$array[$#array]);}
}
- if (-e "/tmp/hddshutdown-".$array[$#array]){$status = " standby\n";}
+ if (-e "/var/run/hddshutdown-".$array[$#array]){$status = " standby\n";}
else{$status = " active\n";}
- open(DATEI, ">>/tmp/hddstatus") || die "Datei nicht gefunden";
+ open(DATEI, ">>/var/run/hddstatus") || die "Datei nicht gefunden";
print DATEI $disk."-".$status;
close(DATEI);