summaryrefslogtreecommitdiffstats
path: root/remote/modules/vmplayer
diff options
context:
space:
mode:
authorJonathan Bauer2013-08-02 17:27:28 +0200
committerJonathan Bauer2013-08-02 17:27:28 +0200
commit3ba5a58e5b04b771e6ee99ee6d6f772991c1c236 (patch)
tree0d91e40266c79ac1f06cf07cef82fe70563f9a34 /remote/modules/vmplayer
parent[rootfs-stage32] add find and grep to config file (diff)
downloadtm-scripts-3ba5a58e5b04b771e6ee99ee6d6f772991c1c236.tar.gz
tm-scripts-3ba5a58e5b04b771e6ee99ee6d6f772991c1c236.tar.xz
tm-scripts-3ba5a58e5b04b771e6ee99ee6d6f772991c1c236.zip
[vmchooser] moved all vmchooser specific files and scripts to /opt/openslx. Renamed 'var/lib/virt' to 'mnt/vmstore'. Added bwlehrpool theme for vmchooser#
Diffstat (limited to 'remote/modules/vmplayer')
-rw-r--r--remote/modules/vmplayer/data/etc/systemd/system/vmware.service2
-rw-r--r--remote/modules/vmplayer/data/opt/openslx/etc/vmware/nvram (renamed from remote/modules/vmplayer/data/etc/openslx/vmware/nvram)bin8664 -> 8664 bytes
-rw-r--r--remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include (renamed from remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include)4
-rw-r--r--remote/modules/vmplayer/data/opt/openslx/etc/vmware/vmware.conf (renamed from remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf)0
-rwxr-xr-xremote/modules/vmplayer/data/opt/openslx/scripts/systemd-vmware_env (renamed from remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env)2
5 files changed, 4 insertions, 4 deletions
diff --git a/remote/modules/vmplayer/data/etc/systemd/system/vmware.service b/remote/modules/vmplayer/data/etc/systemd/system/vmware.service
index 6bffb508..30bb42ff 100644
--- a/remote/modules/vmplayer/data/etc/systemd/system/vmware.service
+++ b/remote/modules/vmplayer/data/etc/systemd/system/vmware.service
@@ -6,4 +6,4 @@ After=vmchooser.service
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/etc/openslx/vmware/vmware-env start
+ExecStart=/opt/openslx/scripts/systemd-vmware_env start
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/nvram b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/nvram
index 85125f1e..85125f1e 100644
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/nvram
+++ b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/nvram
Binary files differ
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
index 71d294cb..675835a9 100644
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include
+++ b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/run-virt.include
@@ -425,7 +425,7 @@ diskfile="${vmpath}"
vmhome="${HOME}/.vmware"
# get several version infos for vmware/player
-. /etc/openslx/vmware/vmware.conf
+. /opt/openslx/etc/vmware/vmware.conf
vmbuild=$buildversion
vmversion=$version
@@ -549,7 +549,7 @@ sync
# own nvram. We need it for floppy drive b, default nvram has just drive a
# TODO: optimize, currently kinda inefficient, too much copys, but we
# don't know which one is installed...
-cp "/etc/openslx/vmware/nvram" "$confdir/nvram" 2>/dev/null
+cp "/opt/openslx/etc/vmware/nvram" "$confdir/nvram" 2>/dev/null
# logging and stdout
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/vmware.conf
index 210b814f..210b814f 100644
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf
+++ b/remote/modules/vmplayer/data/opt/openslx/etc/vmware/vmware.conf
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env b/remote/modules/vmplayer/data/opt/openslx/scripts/systemd-vmware_env
index feff5135..4103eae6 100755
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env
+++ b/remote/modules/vmplayer/data/opt/openslx/scripts/systemd-vmware_env
@@ -12,7 +12,7 @@
export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin
-VMWARE_CONF_DIR=/etc/openslx/vmware
+VMWARE_CONF_DIR=/opt/openslx/etc/vmware
for wait in 1 1 2 2 3 end; do
grep '^SLX_DNS' /opt/openslx/config > /dev/null && break