[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

[Tobias Powalowski]

    Date: Wednesday, September 17, 2008 @ 17:05:42
  Author: tpowa
Revision: 12653

upgpkg: hwdetect 0.9.1-1

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

----------+
 PKGBUILD |    6 +++---
 hwdetect |    6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-17 20:56:23 UTC (rev 12652)
+++ PKGBUILD	2008-09-17 21:05:42 UTC (rev 12653)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
-pkgver=0.9
-pkgrel=3
+pkgver=0.9.1
+pkgrel=1
 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
 arch=(i686 x86_64)
 license=('custom:none')
@@ -15,4 +15,4 @@
   install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
 }
 
-
+md5sums=('9910a69cdaa1ed29894041a022e5bea5')

Modified: hwdetect
===================================================================
--- hwdetect	2008-09-17 20:56:23 UTC (rev 12652)
+++ hwdetect	2008-09-17 21:05:42 UTC (rev 12653)
@@ -39,6 +39,7 @@
 	echo "    --dsdt                 add dsdt to HOOKS="
 	echo "    --raid                 add raid to HOOKS="
 	echo "    --raid-partitions      add raid-partitions to HOOKS="
+	echo "    --dmraid               add dmraid to HOOKS="
 	echo "    --encrypt              add encrypt to HOOKS="
 	echo "    --lvm2                 add lvm2 to HOOKS="
 	echo "    --keymap               add keymap to HOOKS="
@@ -370,7 +371,7 @@
 			if [ "$HOOKS_DIR" = "" ]; then
 				HOOKS_DIR="/lib/initcpio/install"
 			fi
-			START_HOOKS="base udev dsdt autodetect ide pata scsi sata usb fw pcmcia net raid raid-partitions usbinput keymap encrypt lvm2 filesystems"
+			START_HOOKS="base udev dsdt autodetect ide pata scsi sata usb fw pcmcia net raid raid-partitions dmraid usbinput keymap encrypt lvm2 filesystems"
 			# remove the ones that don't exist on the system
 			for i in ${START_HOOKS}; do
 				if ! [ -e "${HOOKS_DIR}/$i" ]; then 
@@ -403,6 +404,9 @@
 			if ! [ "$RAID_PARTITIONS" = "1" ] ; then 
 				START_HOOKS=$(echo $START_HOOKS | sed -e "s/raid-partitions\ //g")
 			fi
+			if ! [ "$DMRAID" = "1" ] ; then 
+				START_HOOKS=$(echo $START_HOOKS | sed -e "s/dmraid//g")
+			fi
 			### TODO lvm2, encrypt check
 			# encrypt, check for presence of mapper/root
 			#if ! [ "$(ls /dev/mapper/root > /dev/null 2>&1 )" ]; then