Merge branch 'master' into python

src/initscripts/init.d/mdadm

@@ -1,6 +1,6 @@
 #!/bin/sh
 ########################################################################
-# Begin $rc_base/init.d/mdadmraid
+# Begin $rc_base/init.d/mdadm
 #
 # Description : This script controls software Raid
 #
@@ -17,28 +17,15 @@
 
 case "${1}" in
    start)
-   
-		if [ -f /etc/mdadm.conf ]
-		then
-			boot_mesg "Starting Raid devices..."
-			
-			modprobe md
-			modprobe raid0
-			modprobe raid1
-			modprobe raid5
-			
-			sleep 1
-			
-			mdadm --assemble --scan
-		else
-			boot_mesg "Skipping raid devices, no config found..."
-			exit 1
-		fi 
+		boot_mesg "Scan/assemble mdadm raid devices..."
+		mdadm --assemble --scan
+		echo_ok
 		;;
 
    stop)
 		boot_mesg "Stopping Raid devices..."
 		mdadm --stop --scan
+		echo_ok
 		;;
 
    restart)
@@ -57,4 +44,4 @@ case "${1}" in
 		;;
 esac
 
-# End $rc_base/init.d/mdadmraid
+# End $rc_base/init.d/mdadm

src/initscripts/init.d/squid

@@ -88,6 +88,7 @@ case "$1" in
 			evaluate_retval
 			killproc /usr/bin/squidGuard >/dev/null
 			killproc /usr/sbin/updxlrator >/dev/null
+			killproc /usr/bin/squidclamav >/dev/null
 			killproc /usr/sbin/squid >/dev/null
 			rm -rf /var/run/squid.pid	
 		fi

src/initscripts/init.d/waitdrives

@@ -0,0 +1,51 @@
+#!/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)
+		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/paks/gnump3d/install.sh

@@ -24,6 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 [ -d /var/mp3 ] ||  ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 )
+/usr/bin/gnump3d-index &
 start_service ${NAME}
 ln -svf  ../init.d/gnump3d /etc/rc.d/rc0.d/K00gnump3d
 ln -svf  ../init.d/gnump3d /etc/rc.d/rc3.d/S99gnump3d

src/scripts/scanhd

@@ -2,7 +2,16 @@
 
 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/.mdadm ]; then
+			echo 'md;"MD Software-Raid";' >> /var/ipfire/extrahd/scan
+		fi
+		if [ -e /dev/mmcblk0 ]; then
+			echo 'mmcblk0;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan
+		fi
+		if [ -e /dev/mmcblk1 ]; then
+			echo 'mmcblk1;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan
+		fi
 		;;
 	partitions)
 		cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \