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

[Tobias Powalowski]

    Date: Friday, January 16, 2015 @ 09:26:49
  Author: tpowa
Revision: 229374

upgpkg: hwdetect 2015.01-1

remove btrfs hook, not needed anymore

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

----------+
 PKGBUILD |    4 ++--
 hwdetect |    9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-16 08:14:45 UTC (rev 229373)
+++ PKGBUILD	2015-01-16 08:26:49 UTC (rev 229374)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
-pkgver=2013.12
+pkgver=2015.01
 pkgrel=1
 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
 arch=(any)
@@ -16,4 +16,4 @@
 package() {
   install -D -m 755 "${srcdir}/hwdetect" "${pkgdir}/usr/bin/hwdetect"
 }
-md5sums=('b55e0501dab6599e94c3b5c54c2166bc')
+md5sums=('9010adf5ce888bda4e71a64353f6eabf')

Modified: hwdetect
===================================================================
--- hwdetect	2015-01-16 08:14:45 UTC (rev 229373)
+++ hwdetect	2015-01-16 08:26:49 UTC (rev 229374)
@@ -50,7 +50,6 @@
 	echo "    --keymap               add keymap to HOOKS="
 	echo "    --pcmcia               add pcmcia to HOOKS="
 	echo "    --nfs                  add net to HOOKS="
-	echo "    --btrfs                add btrfs to HOOKS="
 	exit 1
 }
 
@@ -98,9 +97,6 @@
 # nfs switch
 [ "$(echo $* | grep '\-nfs')" ] && NFS=1
 
-# btrfs switch
-[ "$(echo $* | grep '\-btrfs')" ] && BTRFS=1
-
 # hooks switch
 [ "$(echo $* | grep '\-hooks')" ] && HOOKS=1
 
@@ -247,7 +243,7 @@
 			if [ "$HOOKS_DIR" = "" ]; then
 				HOOKS_DIR="/usr/lib/initcpio/install"
 			fi
-			START_HOOKS="base udev keymap autodetect modconf block pcmcia net dmraid keyboard $ADVANCED btrfs filesystems fsck"
+			START_HOOKS="base udev keymap autodetect modconf block pcmcia net dmraid keyboard $ADVANCED filesystems fsck"
 			# remove the ones that don't exist on the system
 			for i in ${START_HOOKS}; do
 				if ! [ -e "${HOOKS_DIR}/$i" ]; then 
@@ -266,9 +262,6 @@
 			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) echo "$ADVANCED"