X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Fscripts%2Fscanhd;h=b208bbb1d1ab5f145774fbd638faeebf7d92e607;hp=ee946b79275eb601e7b53bc26897237156547e3c;hb=d9c6f56c2ea171cbc1fa396feb30d2814b9a818d;hpb=e3f28dd56f0df59ec70aeb50df87f8bb552e1aa4

diff --git a/src/scripts/scanhd b/src/scripts/scanhd
index ee946b7927..b208bbb1d1 100644
--- a/src/scripts/scanhd
+++ b/src/scripts/scanhd
@@ -1,20 +1,17 @@
 #!/bin/bash
-
 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" | grep '^"' -v > /var/ipfire/extrahd/scan
-		if [ -e /dev/.mdadm ]; then
-			echo 'md;"MDADM 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
+		rm -f /var/ipfire/extrahd/scan
+		for DEV in `find /sys/block/* -maxdepth 0 ! -name sr* ! -name ram* ! -name loop* -exec basename {} \; | sort | uniq`
+		do
+			VENDOR=`cat /sys/block/$DEV/device/vendor 2>/dev/null`
+			MODEL=`cat /sys/block/$DEV/device/model 2>/dev/null`
+			REV=`cat /sys/block/$DEV/device/rev 2>/dev/null`
+			echo "$DEV;$VENDOR $MODEL $REV" >> /var/ipfire/extrahd/scan
+		done
 		;;
 	partitions)
-		cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \
+		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 -c /dev/null -s UUID -o value /dev/${device});"