diff options
| author | Michael Neves | 2013-06-03 15:30:27 +0200 |
|---|---|---|
| committer | Michael Neves | 2013-06-03 15:30:27 +0200 |
| commit | cbb666740e668f5ce471b3568243330ea5a1ce08 (patch) | |
| tree | 0dfde6c63e0f6d0ea0070c5814620e3e985ff002 /remote/modules | |
| parent | vmware network (diff) | |
| parent | Merge branch 'master' of dnbd3:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-cbb666740e668f5ce471b3568243330ea5a1ce08.tar.gz tm-scripts-cbb666740e668f5ce471b3568243330ea5a1ce08.tar.xz tm-scripts-cbb666740e668f5ce471b3568243330ea5a1ce08.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/vmplayer/vmplayer.build | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 70143a7e..1c9887ef 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -1,10 +1,10 @@ fetch_source() { #mount vmware bundle directory - [ ! -d /mnt/store/vmware ] && mkdir -p /mnt/store/vmware - if [ "x$(ls /mnt/store/vmware)" == "x" ]; then - mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store/vmware || perror "Could not mount vmware bundle directory. Exiting." + [ ! -d /mnt/store ] && mkdir -p /mnt/store + if [ "x$(ls /mnt/store)" == "x" ]; then + mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store || perror "Could not mount vmware bundle directory. Exiting." fi - ARCH=$(uname -m) + ARCH="$(uname -m)" [ "$ARCH" = "i686" ] && ARCH=i386 local BUNDLE="$(find /mnt/store/vmware -type f -name "VMware-Player*.${ARCH}.bundle" | head -1)" [ -z "$BUNDLE" ] && perror "Could not find vmplayer at /mnt/store for ARCH = $ARCH" @@ -87,6 +87,7 @@ build_modules() { [ -e "/etc/vmware/config" ] && cp "/etc/vmware/config" "/etc/vmware/config.mltk.bak" + mkdir -p "/etc/vmware" || perror "Could not create /etc/vmware" cat > "/etc/vmware/config" << EOF .encoding = "UTF-8" installerDefaults.componentDownloadEnabled = "yes" @@ -135,7 +136,9 @@ EOF pinfo "KOMPALIERE VMWARE KERNEL MODULE" for MOD in vsock vmblock vmmon vmnet vmci; do pinfo "Kompaliere $MOD" - "$VMWARE_MODCONFIG" --console --build-mod -k "$UTS_RELEASE $MOD" "$(which gcc)" "$MODULES_DIR/kernel/ksrc/include" "vmplayer" "$MOD" + [ -s "/lib/modules/$UTS_RELEASE/vmplayer/$MOD.ko" ] && unlink "/lib/modules/$UTS_RELEASE/vmplayer/$MOD.ko" + "$VMWARE_MODCONFIG" --console --build-mod -k "$UTS_RELEASE" "$MOD" "$(which gcc)" "$MODULES_DIR/kernel/ksrc/include" "vmplayer" "$MOD" + [ ! -s "/lib/modules/$UTS_RELEASE/vmplayer/$MOD.ko" ] && perror "Error compiling via $VMWARE_MODCONFIG" done cd - |
