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

Tobias Powalowski tpowa at archlinux.org
Tue Jul 6 16:39:58 EDT 2010


    Date: Tuesday, July 6, 2010 @ 16:39:58
  Author: tpowa
Revision: 85010

upgpkg: hwdetect 2010.07-1
add btrfs support

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-06 17:43:36 UTC (rev 85009)
+++ PKGBUILD	2010-07-06 20:39:58 UTC (rev 85010)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
-pkgver=2010.06
-pkgrel=3
+pkgver=2010.07
+pkgrel=1
 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
 arch=(any)
 license=('GPL')
@@ -16,4 +16,4 @@
 build() {
   install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect
 }
-md5sums=('12854d7a9f3e0347355e12a00b52cdb9')
+md5sums=('f33b954c2749c0ec4ce4dea94dc74da9')

Modified: hwdetect
===================================================================
--- hwdetect	2010-07-06 17:43:36 UTC (rev 85009)
+++ hwdetect	2010-07-06 20:39:58 UTC (rev 85010)
@@ -105,6 +105,9 @@
 # nfs switch
 [ "$(echo $* | grep '\-nfs')" ] && NFS=1
 
+# nfs switch
+[ "$(echo $* | grep '\-btrfs')" ] && BTRFS=1
+
 # vmware switch
 [ "$(echo $* | grep '\-vmware')" ] && VMWARE=1
 
@@ -527,7 +530,7 @@
 			if [ "$HOOKS_DIR" = "" ]; then
 				HOOKS_DIR="/lib/initcpio/install"
 			fi
-			START_HOOKS="base v86d udev keymap autodetect ide pata scsi sata usb fw pcmcia net dmraid usbinput $ADVANCED filesystems"
+			START_HOOKS="base v86d udev keymap autodetect ide pata scsi sata usb fw pcmcia net dmraid usbinput $ADVANCED btrfs filesystems"
 			# remove the ones that don't exist on the system
 			for i in ${START_HOOKS}; do
 				if ! [ -e "${HOOKS_DIR}/$i" ]; then 
@@ -564,6 +567,9 @@
 			if ! [ "$NFS" = "1" ]; then
 				START_HOOKS=$(echo $START_HOOKS | sed -e "s/net//g")
 			fi
+			if ! [ "$BTRFS" = "1" ]; then
+				START_HOOKS=$(echo $START_HOOKS | sed -e "s/btrfs//g")
+			fi
 			echo "HOOKS=\"$START_HOOKS\"" | sed -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
 		;;
 		--advanced) ADVANCED_ARCHBOOT=""



More information about the arch-commits mailing list