ts-logs-capture: provide xenctx with an appropriate -s argument

diff --git a/ts-logs-capture b/ts-logs-capture
index cbca2db2fc1cebc4f84b6aa77216ab2f9454c734..a45c359a6c3e1f380fd3a7c51d796e840773385c 100755 (executable)
--- a/ts-logs-capture
+++ b/ts-logs-capture
@@ -192,7 +192,12 @@ sub fetch_logs_guest ($) {
 
     if (defined $gho->{Vcpus}) {
         foreach (my $vcpu=0; $vcpu < $gho->{Vcpus}; $vcpu++) {
-            try_cmd_output_save("/usr/lib/xen/bin/xenctx $gho->{Domid} $vcpu");
+           my $kernpath = guest_var($gho,'kernel_path',$r{xen_kernel_path});
+           my $sysmaparg = !defined $kernpath ? '' :
+               $kernpath !~ m,/vmlinuz-, ? die "$kernpath ?" :
+               "-s $`/System.map-$'";
+           try_cmd_output_save("/usr/lib/xen/bin/xenctx ".$sysmaparg.
+                               " $gho->{Domid} $vcpu");
         }
     }