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 154fbbe9fccc580792a82d1bb858d6911faa6269 (commit) via 33af74ea91c5cf150f13be9bad2a1c8b8ea65cf5 (commit) via e44dfea3bad0ee92e2645bcd3b1082c7d780b39a (commit) from b1e4de058e71db030ec6e0e237fb479b77e8efb6 (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 154fbbe9fccc580792a82d1bb858d6911faa6269 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Apr 17 18:11:31 2011 +0200

core49: add extrahd changes to updater.

commit 33af74ea91c5cf150f13be9bad2a1c8b8ea65cf5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Apr 17 18:09:28 2011 +0200

extrahd: add support for mdadm devices. remove wrong devline of some usb-keys.

commit e44dfea3bad0ee92e2645bcd3b1082c7d780b39a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Apr 17 18:07:54 2011 +0200

extrahd: display also non-partitioned disks.

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

Summary of changes: config/rootfiles/core/49/filelists/files | 2 ++ html/cgi-bin/extrahd.cgi | 2 +- src/scripts/scanhd | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 4975a5e..8fc42ba 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -3,6 +3,7 @@ etc/rc.d/init.d/squid etc/rc.d/init.d/waitdrives etc/rc.d/rcsysinit.d/S19waitdrives var/ipfire/backup/bin/backup.pl +srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi @@ -11,3 +12,4 @@ var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/es.pl var/ipfire/langs/fr.pl +usr/local/bin/scanhd diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 2ea4178..fa12dbe 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -202,7 +202,7 @@ END foreach $partitionentry (sort @partitions) { @partitionline = split( /;/, $partitionentry ); - if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && ! ( "$partitionline[0]" eq "$scanline[0]" )) { + if (( "$partitionline[0]" =~ /^$scanline[0]/ ) && !( "$partitionline[2]" == "" )) { $size = int($partitionline[1] / 1024); print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> diff --git a/src/scripts/scanhd b/src/scripts/scanhd index 2d76ba6..9d47e3d 100644 --- a/src/scripts/scanhd +++ b/src/scripts/scanhd @@ -2,7 +2,10 @@

case "$1" in ide) - /sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\' -e "s/$/;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/;X/;/g" > /var/ipfire/extrahd/scan + /sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\' -e "s/$/;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/;X/;/g" | grep '^"' -v > /var/ipfire/extrahd/scan + if [ -e /dev/md ]; then + echo 'md;"MDADM software-raid";' >> /var/ipfire/extrahd/scan + fi ;; partitions) cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \

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