Merge branch 'master' into kernel38

config/rootfiles/common/initscripts

@@ -13,6 +13,7 @@ etc/rc.d/init.d/beep
 #etc/rc.d/init.d/bluetooth
 etc/rc.d/init.d/checkfs
 etc/rc.d/init.d/checkfstab
+etc/rc.d/init.d/waitdrives
 #etc/rc.d/init.d/clamav
 etc/rc.d/init.d/cleanfs
 #etc/rc.d/init.d/client175
@@ -202,6 +203,7 @@ etc/rc.d/rcsysinit.d/S00mountkernfs
 etc/rc.d/rcsysinit.d/S05modules
 etc/rc.d/rcsysinit.d/S10udev
 etc/rc.d/rcsysinit.d/S19checkfstab
+etc/rc.d/rcsysinit.d/S19waitdrives
 etc/rc.d/rcsysinit.d/S20swap
 etc/rc.d/rcsysinit.d/S30checkfs
 etc/rc.d/rcsysinit.d/S40mountfs

config/rootfiles/common/ntfs-3g

@@ -9,6 +9,7 @@ usr/bin/ntfs-3g.probe
 usr/bin/ntfs-3g.secaudit
 usr/bin/ntfs-3g.usermap
 #usr/include/ntfs-3g
+#usr/include/ntfs-3g/acls.h
 #usr/include/ntfs-3g/attrib.h
 #usr/include/ntfs-3g/attrlist.h
 #usr/include/ntfs-3g/bitmap.h
@@ -41,7 +42,6 @@ usr/bin/ntfs-3g.usermap
 #usr/include/ntfs-3g/support.h
 #usr/include/ntfs-3g/types.h
 #usr/include/ntfs-3g/unistr.h
-#usr/include/ntfs-3g/version.h
 #usr/include/ntfs-3g/volume.h
 #usr/include/ntfs-3g/xattrs.h
 #usr/lib/libntfs-3g.a

config/rootfiles/core/49/filelists/files

@@ -1,6 +1,9 @@
 etc/system-release
-etc/init.d/squid
+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
@@ -9,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

config/rootfiles/core/49/filelists/icons

@@ -0,0 +1,13 @@
+srv/web/ipfire/html/images/delete.gif
+srv/web/ipfire/html/images/document-save.png
+srv/web/ipfire/html/images/edit.gif
+srv/web/ipfire/html/images/floppy.gif
+srv/web/ipfire/html/images/forward.gif
+srv/web/ipfire/html/images/info.gif
+srv/web/ipfire/html/images/list-add.png
+srv/web/ipfire/html/images/list-remove.png
+srv/web/ipfire/html/images/package-x-generic.png
+srv/web/ipfire/html/images/reload.gif
+srv/web/ipfire/html/images/stock_ok.png
+srv/web/ipfire/html/images/stock_stop.png
+srv/web/ipfire/html/images/user-trash.png

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'}'>

lfs/initscripts

@@ -163,6 +163,7 @@ $(TARGET) :
 	ln -sf ../init.d/modules     /etc/rc.d/rcsysinit.d/S05modules
 	ln -sf ../init.d/udev        /etc/rc.d/rcsysinit.d/S10udev
 	ln -sf ../init.d/checkfstab  /etc/rc.d/rcsysinit.d/S19checkfstab
+	ln -sf ../init.d/waitdrives  /etc/rc.d/rcsysinit.d/S19waitdrives
 	ln -sf ../init.d/swap        /etc/rc.d/rcsysinit.d/S20swap
 	ln -sf ../init.d/checkfs     /etc/rc.d/rcsysinit.d/S30checkfs
 	ln -sf ../init.d/mountfs     /etc/rc.d/rcsysinit.d/S40mountfs

src/initscripts/init.d/waitdrives

@@ -0,0 +1,56 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/waitdrives
+#
+# Description : Wait for drives before fscheck/mount
+#
+# Authors     : Arne Fitzenreiter - arne_f@ipfire.org
+#
+# Version     : 00.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+check_drives () {
+	drives_ready="1";
+	for drive in $drives; do
+		if [ `blkid | grep $drive | wc -l` == 0 ]; then
+			drives_ready="0";
+		fi
+	done
+}
+
+case "${1}" in
+	start)
+		if [ -e /sbin/mdadm ]; then
+			boot_mesg "Assemble mdadm managed raid-drives ..."
+			mdadm --assemble --scan
+		fi
+
+		drives=`grep "^UUID=" /etc/fstab | cut -f1 | cut -d" " -f1 | cut -d"=" -f2`;
+
+		check_drives;
+		if [ "$drives_ready" == "0" ]; then
+			boot_mesg -n "Wait for devices used in fstab "
+			for (( i=1; i<30; i++)) do
+				check_drives;
+				if [ "$drives_ready" == "1" ]; then
+					break;
+				fi
+				boot_mesg -n "."
+				sleep 1
+			done
+		fi
+		exit 0;
+		;;
+	*)
+		echo "Usage: ${0} {start}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/waitdrives

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:]*$" | \