Commit 48d5a76c authored by Guillaume Hervier's avatar Guillaume Hervier

software/kvm: Fix log path in kvm-started-promise

parent c6733656
......@@ -259,7 +259,8 @@ mode = 700
context =
raw dash {{ dash_executable_location }}
raw qemu_ready_path ${kvm-controller-parameter-dict:kvm-status-path}
raw qemu_service_log_file ${buildout:directory}/.${slap-connection:partition-id}_kvm.log
raw qemu_log_prefix ${buildout:directory}/.${slap-connection:partition-id}_
raw qemu_service_path ${kvm-instance:wrapper-path}
[novnc-instance]
recipe = slapos.cookbook:novnc
......
......@@ -99,7 +99,7 @@ recipe = hexagonit.recipe.download
ignore-existing = true
url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
mode = 644
md5sum = b4a95f8398dac8de58254899b4545439
md5sum = 09f7ac097cc61bed7c07a5cbf23a0962
download-only = true
on-update = true
......@@ -226,7 +226,7 @@ ignore-existing = true
url = ${:_profile_base_location_}/template/qemu-is-ready.in
mode = 644
filename = qemu-is-ready.in
md5sum = b304eec8e2cb71f10ea83cac22f6db12
md5sum = e7d58bd2eb848e9e9540929be866bde0
download-only = true
on-update = true
......
#!{{ dash }}
FILE="{{ qemu_ready_path }}"
QEMU_SERVICE_PATH="{{ qemu_service_path }}"
# don't start checks too fast
sleep 2
if [ -f "$FILE" ]; then
......@@ -12,7 +14,7 @@ if [ -f "$FILE" ]; then
exit 1
fi
else
log_file="{{ qemu_service_log_file }}"
log_file="{{ qemu_log_prefix }}$(basename $QEMU_SERVICE_PATH-*).log"
>&2 echo "Qemu process is not correctly started."
if [ -f "$log_file" ]; then
>&2 echo "** Latest ouput logs **"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment