summaryrefslogtreecommitdiffstats
path: root/remote/modules/vmplayer/data
diff options
context:
space:
mode:
authorSimon Rettberg2013-05-14 18:54:48 +0200
committerSimon Rettberg2013-05-14 18:54:48 +0200
commit362fbbb7c888e125b0270eda89878859eac0e3f4 (patch)
tree67eb9d52db7d7aa9ce306ccb4f464cd7c275b378 /remote/modules/vmplayer/data
parentpxelinux.0 (diff)
parentchange ipxe source (diff)
downloadtm-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/data')
-rw-r--r--remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include2
l---------remote/modules/vmplayer/data/etc/systemd/system/graphical.target.wants/vmware.service1
-rw-r--r--remote/modules/vmplayer/data/etc/systemd/system/vmware.service1
3 files changed, 3 insertions, 1 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