Date: Thursday, February 11, 2010 @ 03:00:02
Author: tpowa
Revision: 68162
Merged revisions 68161 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/hwdetect/trunk
........
r68161 | tpowa | 2010-02-11 08:59:19 +0100 (Do, 11 Feb 2010) | 2 lines
upgpkg: hwdetect 2010.02-3
fixed various output things
........
Modified:
hwdetect/repos/extra-x86_64/ (properties)
hwdetect/repos/extra-x86_64/PKGBUILD
hwdetect/repos/extra-x86_64/hwdetect
----------+
PKGBUILD | 5 +++--
hwdetect | 12 +++++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
Property changes on: hwdetect/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /hwdetect/trunk:1-67612
+ /hwdetect/trunk:1-68161
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2010-02-11 07:59:19 UTC (rev 68161)
+++ extra-x86_64/PKGBUILD 2010-02-11 08:00:02 UTC (rev 68162)
@@ -2,7 +2,7 @@
# Maintainer: Tobias Powalowski <tp...@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: extra-x86_64/hwdetect
===================================================================
--- extra-x86_64/hwdetect 2010-02-11 07:59:19 UTC (rev 68161)
+++ extra-x86_64/hwdetect 2010-02-11 08:00:02 UTC (rev 68162)
@@ -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
