diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-28 08:47:30 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-28 08:47:30 +0100 |
| commit | d5acc51bdb801d2bb930af53220946e739dd5edd (patch) | |
| tree | ca90bf81203766e39c0f656cf371135530092422 /community/open-vm-tools | |
| parent | 1c2a0b0ad198c54e908452121ed1ab42e7d50809 (diff) | |
| parent | 2493f16093b14a81e949bd6a1b89724cb931807d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/xemacs/PKGBUILD
community/gkrellm/PKGBUILD
community/ldns/PKGBUILD
community/tomoyo-tools/PKGBUILD
community/unbound/PKGBUILD
staging/kdelibs/PKGBUILD
staging/opencv/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community/open-vm-tools')
| -rw-r--r-- | community/open-vm-tools/PKGBUILD | 6 | ||||
| -rw-r--r-- | community/open-vm-tools/open-vm-tools.rc.d | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index 5be5138ce..87a7a8f21 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61569 2012-01-03 12:06:41Z spupykin $ +# $Id: PKGBUILD 62772 2012-01-26 14:44:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools pkgver=2011.12.20 _pkgsubver=562307 -pkgrel=1 +pkgrel=2 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64' 'mips64el') url="http://open-vm-tools.sourceforge.net/" @@ -29,7 +29,7 @@ md5sums=('529c15cb6cfa2972a96664c504dee560' '199508b0d3fe6fa9b726d09170bf51f1' '8c333a979578bdc0c3134c1dd6bb7353' '79b0a14d86191fee70a4639da8bd7785' - '136ff53d0d3a303d09266a407fd2d215' + '67cb83a9e5a4dd016c1a1da2863ca36d' 'b55d15e2c4be396aad709aeca91033d3' '73cc1a2665b0dd62427733d62ead8b9a' '75a25d83417e683957321f97a00f8465') diff --git a/community/open-vm-tools/open-vm-tools.rc.d b/community/open-vm-tools/open-vm-tools.rc.d index 555fa1535..0c9221489 100644 --- a/community/open-vm-tools/open-vm-tools.rc.d +++ b/community/open-vm-tools/open-vm-tools.rc.d @@ -13,7 +13,7 @@ case "$1" in if [ "$VM_DRAG_AND_DROP" == "yes" ]; then VMBLOCK=`grep -w vmblock /proc/modules` - [ -z "$VMBLOCK" ] && modprobe -f vmblock + [ -z "$VMBLOCK" ] && modprobe vmblock if [ $? -gt 0 ]; then stat_fail exit 1 @@ -36,7 +36,7 @@ case "$1" in for m in vmhgfs vmsync; do VMMOD=`grep -w $m /proc/modules` [ -z "$VMMOD" ] && \ - { modprobe -f $m + { modprobe $m if [ $? -gt 0 ]; then stat_fail exit 1 |