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

Tobias Powalowski tpowa at archlinux.org
Thu Feb 11 07:59:19 UTC 2010


    Date: Thursday, February 11, 2010 @ 02:59:19
  Author: tpowa
Revision: 68161

upgpkg: hwdetect 2010.02-3
    fixed various output things

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

----------+
 PKGBUILD |    5 +++--
 hwdetect |   12 +++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-11 07:08:56 UTC (rev 68160)
+++ PKGBUILD	2010-02-11 07:59:19 UTC (rev 68161)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
 pkgver=2010.02
-pkgrel=2
+pkgrel=3
 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,4 +16,5 @@
 build() {
   install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
 }
-md5sums=('37c57d0158761b5ece8fdc341cdcce43')
+
+md5sums=('8481aa25d82f06464a63c493f66a2742')

Modified: hwdetect
===================================================================
--- hwdetect	2010-02-11 07:08:56 UTC (rev 68160)
+++ hwdetect	2010-02-11 07:59:19 UTC (rev 68161)
@@ -108,6 +108,9 @@
 # vmware switch
 [ "$(echo $* | grep '\-vmware')" ] && VMWARE=1
 
+# vmware switch
+[ "$(echo $* | grep '\-hooks')" ] && HOOKS=1
+
 ADVANCED=""
 # root device check
 if ! [ "$ROOTDEVICE" = "" ]; then
@@ -483,15 +486,18 @@
 				;;
 		--uvesafb) 	FB="uvesafb"
 				MODULES_INITRAMFS="$FB $MODULES_INITRAMFS"
-				showlist2 "MODULES" \"$MODULES_INITRAMFS\" | sed -e 's/(\  /(/g' -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
+				! [ "$HOOKS" = "1" ] && showlist2 "MODULES" \"$MODULES_INITRAMFS\" | sed -e 's/(\  /(/g' -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
 				;;
 		--fbmodule) 	FB=""
 				for i in $(cat /etc/modprobe.d/framebuffer_blacklist.conf); do
 				    i=$(echo $i | sed -e 's/blacklist //g')
-                                    cat /proc/modules | grep -q ^$i && FB="$i"
+				    # check if already in FB array, to avoid double entries
+				    if [ "$(cat /proc/modules | grep ^$i)" ]; then
+					! [ "$(grep -w $FB)" ] && FB="$i"
+				    fi
                                 done
 				MODULES_INITRAMFS="$FB $MODULES_INITRAMFS "
-				showlist2 "MODULES" \"$MODULES_INITRAMFS\" | sed -e 's/(\  /(/g' -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
+				! [ "$HOOKS" = "1" ] && showlist2 "MODULES" \"$MODULES_INITRAMFS\" | sed -e 's/(\  /(/g' -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
 				;;
 		--net)  if [ "$(showlist2 "MODULES"  \($(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/) $(listmods drivers/staging/) \) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' | grep '8139cp')" ] ; then
 				if [ "$(dmesg | grep 'use 8139too')" ]; then




More information about the arch-commits mailing list