diff options
| author | Simon Rettberg | 2013-05-14 18:54:48 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-05-14 18:54:48 +0200 |
| commit | 362fbbb7c888e125b0270eda89878859eac0e3f4 (patch) | |
| tree | 67eb9d52db7d7aa9ce306ccb4f464cd7c275b378 /remote/modules/vmplayer | |
| parent | pxelinux.0 (diff) | |
| parent | change ipxe source (diff) | |
| download | tm-scripts-362fbbb7c888e125b0270eda89878859eac0e3f4.tar.gz tm-scripts-362fbbb7c888e125b0270eda89878859eac0e3f4.tar.xz tm-scripts-362fbbb7c888e125b0270eda89878859eac0e3f4.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/vmplayer')
4 files changed, 9 insertions, 3 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 65db53da..bc93d68b 100644 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include @@ -421,7 +421,7 @@ esac # check if ide/scsi and hwver of image # read only the first 30 lines to be shure -imghead=$(head -30 ${diskfile}) +imghead=$(head -n 30 ${diskfile}) hddrv=$(echo "${imghead}" | grep -m1 -ia "ddb.adapterType" |\ awk -F '"' '{print $2}') hwver=$(echo "${imghead}" | grep -m1 -ia "ddb.virtualHWVersion" |\ diff --git a/remote/modules/vmplayer/data/etc/systemd/system/graphical.target.wants/vmware.service b/remote/modules/vmplayer/data/etc/systemd/system/graphical.target.wants/vmware.service new file mode 120000 index 00000000..7deb4820 --- /dev/null +++ b/remote/modules/vmplayer/data/etc/systemd/system/graphical.target.wants/vmware.service @@ -0,0 +1 @@ +../vmware.service
\ No newline at end of file diff --git a/remote/modules/vmplayer/data/etc/systemd/system/vmware.service b/remote/modules/vmplayer/data/etc/systemd/system/vmware.service index 067b15a0..df5331e0 100644 --- a/remote/modules/vmplayer/data/etc/systemd/system/vmware.service +++ b/remote/modules/vmplayer/data/etc/systemd/system/vmware.service @@ -1,6 +1,7 @@ [Unit] Description=Sets up the vmware environment Wants=graphical.target +Before=graphical.target [Service] Type=simple diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 1e3090ac..21d28dec 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -1,7 +1,9 @@ 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." + 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." + fi ARCH=$(uname -m) [ "$ARCH" = "i686" ] && ARCH=i386 local BUNDLE="$(find /mnt/store/vmware -type f -name "VMware-Player*.${ARCH}.bundle" | head -1)" @@ -29,6 +31,8 @@ build() { cp -r ./src/vmware-vmx/lib/{bin,icu,lib,libconf,scripts} "$TARGET" || perror "Could not copy many things from vmware-vmx." [ ! -L "$TARGET/bin/vmplayer" ] && { ln -s /usr/lib/vmware/bin/appLoader "$TARGET/bin/vmplayer" || perror "Could not link vmplayer to appLoader."; } chmod +x "$TARGET"/bin/* + chmod +x "$MODULE_BUILD_DIR"/usr/{bin,sbin}/* + chmod +x "$TARGET"/lib/*.sh pinfo "Patching LIBCONF_DIR" local file="" for file in $(grep -rl "@@LIBCONF_DIR@@" "$MODULE_BUILD_DIR"); do @@ -49,7 +53,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/ -name gconv -type d)" "$TARGET_BUILD_DIR" : } |