This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 8845173bd6ebcd3ec82a6e2a674da509446d597b (commit) via 3c43cafe14ff93fa92932d0895cb4ba7e3d25e83 (commit) from 1c32aae7e33a6287a7e4f90c69c930b107afc4f7 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 8845173bd6ebcd3ec82a6e2a674da509446d597b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 20 00:15:54 2011 +0100

makegraphs: Remove some erroroutputs.

commit 3c43cafe14ff93fa92932d0895cb4ba7e3d25e83 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 20 00:13:39 2011 +0100

Fix parted package build.

-----------------------------------------------------------------------

Summary of changes: lfs/parted | 10 +++++++++- src/scripts/makegraphs | 8 ++++---- 2 files changed, 13 insertions(+), 5 deletions(-)

Difference in files: diff --git a/lfs/parted b/lfs/parted index 7a70d99..25db9e5 100644 --- a/lfs/parted +++ b/lfs/parted @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # # # # 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 # @@ -32,6 +32,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)

+PROG = parted +PAK_VER = 1 + +DEPS = "" + ############################################################################### # Top-level Rules ############################################################################### @@ -50,6 +55,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))

md5 : $(subst %,%_MD5,$(objects))

+dist: + @$(PAK) + ############################################################################### # Downloading, checking, md5sum ############################################################################### diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index c2baee7..97d086a 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -3,7 +3,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2008 Michael Tremer & Christian Schmidt # +# Copyright (C) 2008-2011 IPFire Team info@ipfire.org # # # # 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 # @@ -103,7 +103,7 @@ sub updatehdddata{ system ('/usr/bin/vnstat -u');

my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; -system("unlink /var/run/hddstatus && touch /var/run/hddstatus"); +system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus"); foreach (@disks){ my $disk = $_; chomp $disk; @@ -114,7 +114,7 @@ foreach (@disks){ my $newdiskstats = ""; my @array = split(///,$disk);

- $diskstats = `cat /var/run/hddstats-$array[$#array]`; + $diskstats = `cat /var/run/hddstats-$array[$#array] 2>/dev/null`; chomp $diskstats; my $newdiskstats = `/usr/bin/iostat -d -t $disk | tail -2 | head -1 | awk '{ print $5","$6}'`; chomp $newdiskstats; @@ -122,7 +122,7 @@ foreach (@disks){ chomp $status;

if ($status !~/standby/ || $diskstats ne $newdiskstats){ - if (-e "/var/run/hddshutdown-".$array[$#array]){system("unlink /var/run/hddshutdown-".$array[$#array]);} + if (-e "/var/run/hddshutdown-".$array[$#array]){system("unlink /var/run/hddshutdown-".$array[$#array]." 2>/dev/null");} }

if (-e "/var/run/hddshutdown-".$array[$#array]){$status = " standby\n";}

hooks/post-receive -- IPFire 2.x development tree