vpn-watch: set established check counter back to 10min.

[people/teissler/ipfire-2.x.git] / src / scripts / scanhd

diff --git a/src/scripts/scanhd b/src/scripts/scanhd
index 9ae6e932d9ff355a58522d4571a86e116bbeb7a3..0d97d55303815422d085a877a5447d36707a47f7 100644 (file)
--- a/src/scripts/scanhd
+++ b/src/scripts/scanhd
@@ -2,13 +2,22 @@
 
 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:]*$" | \
                        while read device size; do
                                [ -z "${device}" ] && continue
-                               echo "${device};${size};$(blkid -s UUID -o value /dev/${device});"
+                               echo "${device};${size};$(blkid -c /dev/null -s UUID -o value /dev/${device});"
                        done > /var/ipfire/extrahd/partitions
                ;;
        *)