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 ecb181530ca15245d1286857a13a0978234f7abd (commit) via e528205ed8534cec2c29c0932108d98570c7f07a (commit) from 4c700de4af3de72b80a540fef26b4e056b85193a (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 ecb181530ca15245d1286857a13a0978234f7abd Merge: e528205 4c700de Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Dec 10 13:31:20 2010 +0100

Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

commit e528205ed8534cec2c29c0932108d98570c7f07a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Dec 10 13:29:23 2010 +0100

extrahd: Add UUID to table. Fix blkid without cache does not work as nobody.

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

Summary of changes: config/extrahd/extrahd.pl | 7 +++++-- html/cgi-bin/extrahd.cgi | 14 ++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) mode change 100755 => 100644 html/cgi-bin/pakfire.cgi

Difference in files: diff --git a/config/extrahd/extrahd.pl b/config/extrahd/extrahd.pl index 5f623fd..6593ca4 100644 --- a/config/extrahd/extrahd.pl +++ b/config/extrahd/extrahd.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 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 # @@ -84,8 +84,11 @@ if ( "$ARGV[0]" eq "mount" ) { exit(1); }

+} elsif ( "$ARGV[0]" eq "scanhd") { + system("/usr/local/bin/scanhd $ARGV[1]"); + } else { - print "Usage: $0 (mount|umount) mountpoint\n"; + print "Usage: $0 (mount|umount|scanhd) mountpoint\n"; }

############################################################################################################################ diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index fd35554..b9f42ab 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 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 # @@ -48,8 +48,8 @@ my $partitionentry = ""; my $devicefile = "/var/ipfire/extrahd/devices"; my $scanfile = "/var/ipfire/extrahd/scan"; my $partitionsfile = "/var/ipfire/extrahd/partitions"; -system("/usr/local/bin/scanhd ide"); -system("/usr/local/bin/scanhd partitions"); +system("/usr/local/bin/extrahdctrl scanhd ide"); +system("/usr/local/bin/extrahdctrl scanhd partitions");

&Header::showhttpheaders();

@@ -181,7 +181,7 @@ END @scanline = split( /;/, $scanentry ); print <<END <tr><td colspan="5">&nbsp; - <tr><td align='center'><b>/dev/$scanline[0]</b> + <tr><td align='left' colspan="2"><b>/dev/$scanline[0]</b> <td align='center' colspan="2">$scanline[1] END ; @@ -206,9 +206,11 @@ END $size = int($partitionline[1] / 1024); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <tr><td align="center">/dev/$partitionline[0] + <tr><td align="left" colspan=5><b>UUID=$partitionline[2]</b></td></tr> + <tr> + <td align="list">/dev/$partitionline[0]</td> <td align="center">$Lang::tr{'size'} $size MB - <td align='center'><select name="FS"> + <td align="center"><select name="FS"> <option value="auto">auto</option> <option value="ext3">ext3</option> <option value="reiserfs">reiserfs</option> diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi old mode 100755 new mode 100644

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