diff -Nurp open-vm-tools-modules/modprobe.conf ./modprobe.conf --- open-vm-tools-modules/modprobe.conf 1970-01-01 01:00:00.000000000 +0100 +++ open-vm-tools-modules/modprobe.conf 2011-11-14 12:14:23.148186782 +0100 @@ -0,0 +1,2 @@ +#VMware net driver +install pcnet32 /sbin/modprobe -q --ignore-install vmxnet; /sbin/modprobe -q --ignore-install pcnet32 ; /bin/true; diff -Nurp open-vm-tools-modules/open-vm-tools-modules.install ./open-vm-tools-modules.install --- open-vm-tools-modules/open-vm-tools-modules.install 2011-11-14 06:10:10.000000000 +0100 +++ open-vm-tools-modules/open-vm-tools-modules.install 2011-11-14 12:15:58.197369275 +0100 @@ -3,15 +3,8 @@ KERNEL_VERSION='3.1.0-4-ARCH' post_install() { depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 - VMXNET="install pcnet32 /sbin/modprobe -q --ignore-install vmxnet;" - VMXNET="$VMXNET /sbin/modprobe -q --ignore-install pcnet32 $CMDLINE_OPTS;" - VMXNET="$VMXNET /bin/true;" - - echo ">>> Enabling vmxnet driver in /etc/modprobe.d/modprobe.conf" + echo ">>> Enabling vmxnet driver in /etc/modprobe.d/open-vm-tools-modules.conf" echo ">>> (this will disable pcnet32 driver)" - sed "$ a \\\n#VMware net driver\n$VMXNET" -i /etc/modprobe.d/modprobe.conf - echo - echo ">>>" echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually" echo ">>> disable loading of pcnet32 driver" @@ -25,9 +18,6 @@ post_upgrade() { post_remove() { depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 - echo ">>> Disabling vmxnet driver in /etc/modprobe.d/modprobe.conf" - sed "/VMware net driver/,+1 d" -i /etc/modprobe.d/modprobe.conf - echo ">>>" echo ">>> Remember to un-blacklist pcnet32 driver" echo ">>>" diff -Nurp open-vm-tools-modules/PKGBUILD ./PKGBUILD --- open-vm-tools-modules/PKGBUILD 2011-11-14 06:10:10.000000000 +0100 +++ open-vm-tools-modules/PKGBUILD 2011-11-14 12:18:08.541752855 +0100 @@ -14,8 +14,10 @@ makedepends=('libdnet' 'icu' 'uriparser' depends=("linux") install=$pkgname.install options=('!strip') -source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz") -md5sums=('06f299375a91fbcba9d16b5007490023') +source=("modprobe.conf" + "http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz") +md5sums=('ac9b8e3cb798f5056ca92767ec705117' + '06f299375a91fbcba9d16b5007490023') build() { _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` @@ -40,4 +42,6 @@ package() { done sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install gzip $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/*.ko + + install -D -m 644 ${srcdir}/modprobe.conf ${pkgdir}/etc/modprobe.d/${pkgname}.conf }