diff options
| author | Jonathan Bauer | 2013-07-02 15:26:07 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-07-02 15:26:07 +0200 |
| commit | 8bb0811f6a66709e78e0a8e00e22a3572c0f77c1 (patch) | |
| tree | fa4c2bc4b8d611e24738b6cf99a34932f1633d57 /remote/modules/vmplayer | |
| parent | [pam] add nscd to pam module (might fix vmplayer issues on suse 12.3 64bit) (diff) | |
| parent | [rootfs-stage32] Add /etc/hosts file, make udhcpc script update it (diff) | |
| download | tm-scripts-8bb0811f6a66709e78e0a8e00e22a3572c0f77c1.tar.gz tm-scripts-8bb0811f6a66709e78e0a8e00e22a3572c0f77c1.tar.xz tm-scripts-8bb0811f6a66709e78e0a8e00e22a3572c0f77c1.zip | |
Merge branch 'master' of git:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmplayer')
| -rwxr-xr-x[-rw-r--r--] | remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include | 9 | ||||
| -rw-r--r-- | remote/modules/vmplayer/vmplayer.build | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include index 9b0fea91..e50ed992 100644..100755 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include @@ -117,9 +117,8 @@ MemAllowAutoScaleDown = "FALSE" MemTrimRate = "-1" # ide-disks -ide0:0.present = "$ide" -ide0:0.fileName = "$diskfile" -ide0:0.mode = "independent-nonpersistent" + +ide0:0.mode = \"independent-${diskmode}\" ide1:0.present = "$cdrom0" ide1:0.autodetect = "TRUE" ide1:0.fileName = "auto detect" @@ -134,7 +133,7 @@ scsi0.present = "$scsi" scsi0:0.present = "$scsi" scsi0:0.fileName = "$diskfile" scsi0.virtualDev = "$hddrv" -scsi0:0.mode = "independent-nonpersistent" +scsi0:0.mode = \"independent-${diskmode}\" # floppies floppy0.present = "$floppy0" @@ -447,7 +446,7 @@ cp "/etc/openslx/vmware/nvram" "$confdir/nvram" 2>/dev/null # log script information writelog "# File created by $0 (VMversion ${vmversion})\n# on $(date)\n" -writelog "Starting with non-persistent mode ...\n" +writelog "Starting with ${diskmode} mode ...\n" # write all results to logfile # log disksetup diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index a4dd8a29..4c0d46e6 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -60,7 +60,7 @@ build() { post_copy() { # FIXME: gconftool is copied without dependencies - tarcopy "$(find /usr/lib/ -name gconv -type d)" "$TARGET_BUILD_DIR" + tarcopy "$(find /usr/lib/ /usr/lib64 -name gconv -type d)" "$TARGET_BUILD_DIR" #Update Icon cache for vmplayer gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || pwarning "update-icon-cache-3.0 failed." #fix vmware-usbarbotrator bug @@ -69,7 +69,6 @@ post_copy() { } build_modules() { - pdebug "PAtCHIGN" # need to be in src cd "$MODULE_DIR/src" || perror "Could not cd to '$MODULE_DIR/src'" local VMWARE_MODCONFIG="$MODULE_DIR/src/vmware-vmx/bin/vmware-modconfig" @@ -133,9 +132,9 @@ EOF tar cf "vmblock.tar" "vmblock-only/" || perror "repacking of vmblock.tar failed." cd - - pinfo "KOMPALIERE VMWARE KERNEL MODULE" + pinfo "KOMPILIERE VMWARE KERNEL MODULE" for MOD in vsock vmblock vmmon vmnet vmci; do - pinfo "Kompaliere $MOD" + pinfo "Kompiliere $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" |