summaryrefslogtreecommitdiffstats
path: root/os-plugins
diff options
context:
space:
mode:
authorDirk von Suchodoletz2009-02-18 19:30:34 +0100
committerDirk von Suchodoletz2009-02-18 19:30:34 +0100
commit3d940654da6b1c4afc31128d9bcfdff37c25f8bd (patch)
treeb192d609bb66ca1020cb95c60ef7cf1dea34b3da /os-plugins
parentShould have checked better (revoking parts of r2602). (diff)
downloadcore-3d940654da6b1c4afc31128d9bcfdff37c25f8bd.tar.gz
core-3d940654da6b1c4afc31128d9bcfdff37c25f8bd.tar.xz
core-3d940654da6b1c4afc31128d9bcfdff37c25f8bd.zip
Small fixes in vmware/vmchooser stage3 scripts ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2604 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins')
-rw-r--r--os-plugins/plugins/vmchooser/XX_vmchooser.sh6
-rw-r--r--os-plugins/plugins/vmware/XX_vmware.sh7
2 files changed, 7 insertions, 6 deletions
diff --git a/os-plugins/plugins/vmchooser/XX_vmchooser.sh b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
index 972683ca..59af5e8e 100644
--- a/os-plugins/plugins/vmchooser/XX_vmchooser.sh
+++ b/os-plugins/plugins/vmchooser/XX_vmchooser.sh
@@ -24,7 +24,11 @@ if [ -e $CONFFILE ]; then
/mnt/etc/X11/sessions/
testmkd /mnt/etc/opt/openslx
cp $CONFFILE /mnt/etc/opt/openslx/vmchooser-stage3.conf
-
+
+ testmkd /mnt/var/X11R6/bin
+ cp /mnt/opt/openslx/plugin-repo/vmchooser/run-virt.sh \
+ /mnt/var/X11R6/bin
+
# setup all generic virtualization / starting stuff like the floppy image
testmkd /mnt/var/lib/virt/vmchooser/fd-loop 1777
testmkd /mnt/var/lib/virt/vmchooser/loopimg
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index 60c0fc66..6aa520a2 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -216,12 +216,9 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
# copy version depending files - the vmchooser expects for every virtua-
# lization plugin a file named after it (here run-vmware.include)
testmkd /mnt/etc/opt/openslx
- cp /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/run-virt.include \
+ cp /mnt/opt/openslx/plugin-repo/vmware/run-virt.include \
/mnt/etc/opt/openslx/run-vmware.include
- # copy version depending files (old style)
- cp /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/runvmware \
- /mnt/var/X11R6/bin/run-vmware.sh
- chmod 755 /mnt/var/X11R6/bin/run-vmware.sh
+ # copy version depending files
cp /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/vmplayer \
/mnt/var/X11R6/bin/vmplayer
if [ -e /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/vmware ]; then