From cf037ad50701aa29ffe8e0cccebb4aab3c7751b2 Mon Sep 17 00:00:00 2001 From: thaibault Date: Tue, 2 Jul 2013 14:38:54 +0200 Subject: Patched code to support persistent virtual machines for specified users. --- remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'remote/modules/vmplayer/data') 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 --- 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 -- cgit v1.2.3-55-g7522 From 41108f3056d91b4f8c6fa41be48a4f314f0b5dce Mon Sep 17 00:00:00 2001 From: thaibault Date: Tue, 2 Jul 2013 14:50:35 +0200 Subject: Add executable rights to all scripts. --- remote/modules/vmchooser/data/opt/openslx/bin/clc.bash | 0 remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh | 0 remote/modules/vmchooser/data/opt/openslx/bin/xmlfilter.sh | 0 remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include | 0 4 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 remote/modules/vmchooser/data/opt/openslx/bin/clc.bash mode change 100644 => 100755 remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh mode change 100644 => 100755 remote/modules/vmchooser/data/opt/openslx/bin/xmlfilter.sh mode change 100644 => 100755 remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include (limited to 'remote/modules/vmplayer/data') diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/clc.bash b/remote/modules/vmchooser/data/opt/openslx/bin/clc.bash old mode 100644 new mode 100755 diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh b/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh old mode 100644 new mode 100755 diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/xmlfilter.sh b/remote/modules/vmchooser/data/opt/openslx/bin/xmlfilter.sh old mode 100644 new mode 100755 diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include old mode 100644 new mode 100755 -- cgit v1.2.3-55-g7522 From bdefa9c54725dc3f5cd287a5875d866d5388a685 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 2 Jul 2013 16:57:10 +0200 Subject: Revert changes to 'remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include' Wer ist thaibault und warum macht der Scripte kaputt? --- remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) mode change 100755 => 100644 remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include (limited to 'remote/modules/vmplayer/data') diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include old mode 100755 new mode 100644 index e50ed992..9b0fea91 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include @@ -117,8 +117,9 @@ MemAllowAutoScaleDown = "FALSE" MemTrimRate = "-1" # ide-disks - -ide0:0.mode = \"independent-${diskmode}\" +ide0:0.present = "$ide" +ide0:0.fileName = "$diskfile" +ide0:0.mode = "independent-nonpersistent" ide1:0.present = "$cdrom0" ide1:0.autodetect = "TRUE" ide1:0.fileName = "auto detect" @@ -133,7 +134,7 @@ scsi0.present = "$scsi" scsi0:0.present = "$scsi" scsi0:0.fileName = "$diskfile" scsi0.virtualDev = "$hddrv" -scsi0:0.mode = \"independent-${diskmode}\" +scsi0:0.mode = "independent-nonpersistent" # floppies floppy0.present = "$floppy0" @@ -446,7 +447,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 ${diskmode} mode ...\n" +writelog "Starting with non-persistent mode ...\n" # write all results to logfile # log disksetup -- cgit v1.2.3-55-g7522 From 47733a7f2f1ac3e07795c56a11cdf4019628e6bc Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 4 Jul 2013 17:29:19 +0200 Subject: [vmchooser] Create text file in floppy image that tells the guest the host's resolution [vmplayer] do not override enable3d setting from xml when system supports 3d --- .../vmchooser/data/opt/openslx/bin/run-virt.sh | 31 +++------------------- .../data/etc/openslx/vmware/run-virt.include | 1 - 2 files changed, 3 insertions(+), 29 deletions(-) (limited to 'remote/modules/vmplayer/data') diff --git a/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh b/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh index 826bfecd..eacb8837 100755 --- a/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh +++ b/remote/modules/vmchooser/data/opt/openslx/bin/run-virt.sh @@ -365,30 +365,6 @@ hddrv="ide" audio="true" remotedesktopport="590${VM_ID}" -# Display resolution within the host system -hostres=$(xvidtune -show 2>/dev/null| grep -ve "^$") -xres=$(echo "${hostres}" | awk '{print $3}') -yres=$(echo "${hostres}" | awk '{print $7}') - -# Resolution defined via xml parameter: fullscreen, full/X*Y/depth; windowed, -# win/X*Y/depth -userres=$(grep -io '/dev/null | \ @@ -429,10 +405,9 @@ fi # Copy guest configuration (with added information) config.xml to be accessed # via virtual floppy -# fixme -> to be changed (vmchooser adapts the file content!?) -#TODO: wozu echo? -#echo "Please fix the config.xml generation" -cp ${xmlfile} /etc/openslx/vmchooser/fd-loop/config.xml +cp "$xmlfile" "/etc/openslx/vmchooser/fd-loop/config.xml" +# Add another file with resolution information +xrandr | grep -o -E 'current\s*[0-9]+\s*x\s*[0-9]+' | cut -c 8- | sed -r 's/(\s|\t|\n)//g' | head -1 > "/etc/openslx/vmchooser/fd-loop/hostres.txt" # Get all virtual machine specific stuff from the respective include file if [ -e /etc/openslx/${xmlvirt}/run-virt.include ] ; then 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..45ff2d72 100644 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/run-virt.include @@ -351,7 +351,6 @@ esac local FORCE3D="" if [ -n "$SLX_VMWARE_3D" ]; then FORCE3D='mks.gl.allowBlacklistedDrivers = "TRUE"' - enable3d="TRUE" fi # serial/parallel port defined (e.g. "ttyS0, lp0" or "autodetect") -- cgit v1.2.3-55-g7522