diff options
| author | Simon Rettberg | 2013-05-14 17:06:07 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-05-14 17:06:07 +0200 |
| commit | 746d2e776da606668890164634ea77456bf62f90 (patch) | |
| tree | 603607a65a0d9c500dae07c4a0597089ee8d80b9 /remote/modules/vmplayer | |
| parent | [vmplayer] +x on /usr/bin/* (diff) | |
| parent | Merge branch 'master' of git:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-746d2e776da606668890164634ea77456bf62f90.tar.gz tm-scripts-746d2e776da606668890164634ea77456bf62f90.tar.xz tm-scripts-746d2e776da606668890164634ea77456bf62f90.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmplayer')
4 files changed, 14 insertions, 17 deletions
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env index f4901070..41360bb3 100755 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env @@ -14,6 +14,8 @@ # §generated§ # ----------------------------------------------------------------------------- +export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin + #functions: helper functions tempdir () { # Create a special tempfs directory @@ -54,7 +56,7 @@ if [ -n "$vmnet1" ] ; then echo "1" >/proc/sys/net/ipv4/conf/vmnet1/forwarding 2>/dev/null echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding 2>/dev/null fi - /opt/openslx/rootfs/usr/sbin/udhcpd \ + /opt/openslx/usr/sbin/udhcpd \ -S /etc/vmware/udhcpd/udhcpd-vmnet1.conf fi if [ -n "$vmnet8" ] ; then @@ -77,6 +79,7 @@ fi vmblock () { # let point the path directly to the directory where the binary lives +# TODO: get it to work /usr/bin/vmware-usbarbitrator } @@ -93,7 +96,7 @@ case "$1" in tempdir load_modules vmnetif - vmblock +# vmblock ;; stop) diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf index a67adc18..5a52ca41 100644 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf @@ -1,8 +1,8 @@ # configuration file for vmware background services written in stage3 setup -vmnet0=true -vmnet1=192.168.101.1/24 -vmnet1nat=true -vmnet8=192.168.102.1/24 +#vmnet0=true +#vmnet1=192.168.101.1/24 +#vmnet1nat=true +#vmnet8=192.168.102.1/24 # stage1 variables produced during plugin install version="5.0" buildversion="1031769" diff --git a/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer b/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer index 2b6e8f31..030e9175 100755 --- a/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer +++ b/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer @@ -1,14 +1,4 @@ #!/bin/sh - -for mod in /lib/modules/vmware/*.ko; do - insmod "$mod" && continue - xmessage "Could not load kernel module $mod. vmplayer might fail." -done - -export LIBCONF_DIR=/usr/lib/vmware/libconf - -#/usr/lib/vmware/bin/vmplayer $@ - # radically simplified version of the original script vmplayer by VMware Inc. PREFIX=/usr/lib/vmware # depends on the vmware location exec "$PREFIX"'/lib/wrapper-gtk24.sh' \ diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 07c55c6d..338a6958 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -1,4 +1,7 @@ fetch_source() { + #mount vmware bundle directory + [ ! -d /mnt/store/vmware ] && mkdir -p /mnt/store/vmware + mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store/vmware || perror "Could not mount vmware bundle directory. Exiting." ARCH=$(uname -m) [ "$ARCH" = "i686" ] && ARCH=i386 local BUNDLE="$(find /mnt/store/vmware -type f -name "VMware-Player*.${ARCH}.bundle" | head -1)" @@ -125,6 +128,7 @@ EOF mkdir -p "$TARGET_BUILD_DIR/lib/modules/vmware/" cp "/lib/modules/$UTS_RELEASE/vmplayer/"* "$TARGET_BUILD_DIR/lib/modules/vmware/" || perror "Could not cp vmware modules to target!" + [ -e /etc/vmware/config ] && rm -f /etc/vmware/config + cp /etc/vmware/config.mltk.bak /etc/vmware/config } - |