diff options
| -rw-r--r-- | os-plugins/plugins/vmchooser/files/run-virt.sh | 10 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/files/run-virt.include | 19 |
2 files changed, 18 insertions, 11 deletions
diff --git a/os-plugins/plugins/vmchooser/files/run-virt.sh b/os-plugins/plugins/vmchooser/files/run-virt.sh index 87d7abf3..41144edd 100644 --- a/os-plugins/plugins/vmchooser/files/run-virt.sh +++ b/os-plugins/plugins/vmchooser/files/run-virt.sh @@ -207,10 +207,12 @@ EOL # Adjust sound volume writelog "Unmuting sound...\c " -amixer -q sset Master 28 unmute 2>/dev/null -amixer -q sset PCM 28 unmute 2>/dev/null -amixer -q sset Headphone 28 unmute 2>/dev/null -amixer -q sset Front 0 mute 2>/dev/null +amixer -q sset Master 80% unmute 2>/dev/null +amixer -q sset PCM 80% unmute 2>/dev/null +amixer -q sset CD 80% unmute 2>/dev/null +amixer -q sset Headphone 80% unmute 2>/dev/null +amixer -q sset Front 80% umute 2>/dev/null # In SUSE 11.0 it's Headphone +amixer -q sset Speaker 0 mute 2>/dev/null # annoying built-in speaker writelog "finished\n" # Copy guest configuration (with added information) config.xml to be accessed diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include index a9e24454..56b37d4d 100644 --- a/os-plugins/plugins/vmware/files/run-virt.include +++ b/os-plugins/plugins/vmware/files/run-virt.include @@ -212,13 +212,9 @@ vmbuild=$buildversion vmversion=$version # VMware start options -#-X = fullscreen +# "-X": start in fullscreen vmopt="-X" -# set the variables appropriately -VIRTCMD=vmplayer -VIRTCMDOPTS="${vmopt} ${conffile}" - # hardware checks ################################################################################ @@ -349,6 +345,8 @@ done # logging and stdout ################################################################################ +logfile=${vmhome}/run-vmware.`hostname`.log + # remove ols logs rm ${vmhome}/run-vmware.* >/dev/null 2>&1 @@ -359,7 +357,7 @@ writelog () echo -e "$1" # log in file - echo -e "$1" >>${vmhome}/run-vmware.$$.log + echo -e "$1" >>${logfile} } # log script information @@ -380,7 +378,7 @@ writelog "\tConfdir:\t${confdir}" writelog "\tConffile:\t${conffile}" writelog "\tRedodir:\t${redodir}" writelog "\tVMhome:\t\t${vmhome}" -writelog "\tLogfile:\t${vmhome}/run-vmware.$$.log" +writelog "\tLogfile:\t${logfile}" writelog "\t/tmp info: \ $(grep "/tmp " /proc/mounts) $(df -h | grep " /tmp$" | awk '{print $2}')" # HW setup @@ -405,3 +403,10 @@ else fi writelog "\tDisplayname:\t${displayname}\n" + +# finally set env for run-virt.sh +################################################################################ + +VIRTCMD=vmplayer +VIRTCMDOPTS="${vmopt} ${conffile}" + |