diff options
| author | Christian Rößler | 2015-09-14 13:20:27 +0200 |
|---|---|---|
| committer | Christian Rößler | 2015-09-14 13:20:27 +0200 |
| commit | 9b7fe86c080e83410b91c8bf6ebc200a20a204bc (patch) | |
| tree | 24396e2fa5a014a1aa6489a6eaf5165f89a98862 /remote | |
| parent | [runvirt] Logging per writelog now has timestamp; sound setup: echo -> writelog (diff) | |
| download | tm-scripts-9b7fe86c080e83410b91c8bf6ebc200a20a204bc.tar.gz tm-scripts-9b7fe86c080e83410b91c8bf6ebc200a20a204bc.tar.xz tm-scripts-9b7fe86c080e83410b91c8bf6ebc200a20a204bc.zip | |
[runvirt] [vmware] Minor cosmetics, logging
Diffstat (limited to 'remote')
5 files changed, 9 insertions, 4 deletions
diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc index fedd5467..b71d43fc 100644 --- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc +++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/detect_legacy.inc @@ -33,7 +33,7 @@ else writelog "Server sent zero byte virtual machine description file. Retriggering legacy mode." fi else - writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}: Error code $ERR. Triggering legacy mode." + writelog "wget ${SLX_VMCHOOSER_BASE_URL}/lecture/${IMGUUID}. Triggering legacy mode." LEGACY=: fi fi diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables.inc index 90d59beb..7edac642 100644 --- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables.inc +++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/get_xml_file_variables.inc @@ -17,7 +17,7 @@ imgrelpath=$(grep -io '<image_name param=.*"' "${xmlfile}" | sed -e "s/&.*;/; /g # [ -z "$imgname" ] && imgname="${imgrelpath}" imgrelpath=${imgrelpath#/mnt/vmstore/} -writelog "imgname: $imgname--" +writelog "Virtual image file name: $imgname" # Imagename w/ full path if echo "${imgname}" | grep -q '^/'; then diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc index 9e0caa5e..99fa0238 100644 --- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc +++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_image_access.inc @@ -51,4 +51,4 @@ if ! [ -e "${vmpath}" ]; then cleanexit 1 fi -writelog "Used diskfile: $vm_diskfile" +writelog "Virtual machine disk file: $vm_diskfile" diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/start_windowmanager.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/start_windowmanager.inc index a3149c24..940f4ff3 100644 --- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/start_windowmanager.inc +++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/start_windowmanager.inc @@ -9,8 +9,10 @@ for dm in openbox kwin xfwm4 metacity blackbox twm fvwm2 ; do if which $dm >/dev/null 2>&1 ; then if [ "$dm" = "fvwm2" ] ; then echo "EdgeScroll 0 0" > ${redodir}/fvwm + writelog "Starting fvwm2." fvwm2 -f ${redodir}/fvwm >/dev/null 2>&1 & else + writelog "Starting ${dm}." $dm >/dev/null 2>&1 & fi break diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files.inc index 05ee1dd5..555688bf 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/write_config_files.inc @@ -2,7 +2,10 @@ # Include: Write config files # ############################### -writelog "redodir: -$redodir- confdir: -$confdir- vmhome/dndlogs: -$vmhome/dndlogs- conffile: -$conffile-" +writelog "Redo directory: ${redodir}" +writelog "Config directory: ${confdir}" +writelog "Config file: ${conffile}" +writelog "vmhome/dndlogs: ${vmhome}/dndlogs" # create vmware directories mkdir -p "$redodir" >/dev/null 2>&1 |