diff options
| author | Christian Rößler | 2015-09-12 17:05:56 +0200 |
|---|---|---|
| committer | Christian Rößler | 2015-09-12 17:05:56 +0200 |
| commit | ea3737c721c9214dd832d2c5c52817bcd359f076 (patch) | |
| tree | 239ad91d4b9bc660d6037df7432701e9dc6b496c /remote | |
| parent | [runvirt] detect_legacy.inc: Some more cosmetics. (diff) | |
| download | tm-scripts-ea3737c721c9214dd832d2c5c52817bcd359f076.tar.gz tm-scripts-ea3737c721c9214dd832d2c5c52817bcd359f076.tar.xz tm-scripts-ea3737c721c9214dd832d2c5c52817bcd359f076.zip | |
[runvirt] [vmware] Some more script cosmetics: "virtual machine description file" (vmware vmx, vbox xml)
Diffstat (limited to 'remote')
4 files changed, 6 insertions, 6 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 7211c5be..fedd5467 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 @@ -30,7 +30,7 @@ else LEGACY= # both strings set: no legacy. if [ ! -s "$TMPDIR/$IMGUUID" ]; then LEGACY= # no legacy: server sent 0 byte file. - writelog "Server sent zero byte vmx template uuid file. Retriggering legacy mode." + 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." diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc index a5f2cbee..9e156951 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmhome_preferences_file.inc @@ -50,4 +50,5 @@ create_vmhome_preferences_file() { pref.eula1.product = "VMware Workstation" pref.eula1.build = "$vmbuild" HEREEND + writelog "Vmware preferences file created in vmhome." } diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc index bac61be6..b39000d7 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc @@ -2,7 +2,7 @@ # Include: Create vmware startup files # ######################################## -writelog "create_vmware_config_file.inc: conffile: -$conffile-" +writelog "Creating vmware configuration file: $conffile" MAXMEM="9999999" MAXCORES="4" @@ -154,7 +154,6 @@ case "$vmostype" in esac real_core_count="$cpu_cores" - [ "$cpu_cores" -gt "$MAXCORES" ] && cpu_cores="$MAXCORES" # It currently makes no sense to set the virtual number of cores diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc index 7b9f46c3..87718029 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc @@ -2,7 +2,7 @@ # Include: Parsing the non-legacy delivered vmxfile $TMPDIR/$IMGUUID # ###################################################################### -writelog "Now in parse_vmx.inc." +writelog "Parsing virtual machine description file..." # check for vmdk file marker %VM_DISK_PATH% and put vmdk path in it's place: also VM_DISK_MODE # and VM_DISK_REDOLOGDIR. @@ -70,8 +70,8 @@ HEREEND awk '!a[$0]++' "${TMPDIR}/${IMGUUID}" > "${TMPDIR}/${IMGUUID}.tmp" && mv "${TMPDIR}/${IMGUUID}.tmp" "${TMPDIR}/${IMGUUID}" # At last_ Let's copy it to $confdir/run-vmware.conf -cp -p "$TMPDIR/$IMGUUID" "$conffile" && writelog "Copied TMPDIR/IMGUUID -$TMPDIR/$IMGUUID- to conffile -$conffile-" || \ - ( writelog "Could not copy TMPDIR/IMGUUID -$TMPDIR/$IMGUUID- to conffile -$conffile-!"; cleanexit 1 ) +cp -p "$TMPDIR/$IMGUUID" "$conffile" && writelog "Copied TMPDIR/IMGUUID ${TMPDIR}/${IMGUUID} to conffile ${conffile}" || \ + ( writelog "Could not copy TMPDIR/IMGUUID -$TMPDIR/$IMGUUID- to conffile ${conffile}!"; cleanexit 1 ) # TODO: Move this to cleanexit. rm -f "$TMPDIR/$IMGUUID" || writelog "Could not delete $TMPDIR/$IMGUUID." |