ts-xen-install: Honour xenstored target var

Nothing sets this yet.

Signed-off-by: Ian Jackson <iwj@xenproject.org>

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 9e85303a0f30ad6a2b868543db47dfd0673a18c9..a0ca694379d930096622ccfbd6f4c1299b69482c 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -179,6 +179,7 @@ our @accessible_runvar_pats =
       host_linux_boot_append         *_host_linux_boot_append
       host_ip                        *_host_ip
       host_power_install             *_host_power_install
+      host_xenstored                 *_host_xenstored
    );
 
 #---------- test script startup ----------

diff --git a/ts-xen-install b/ts-xen-install
index fc4bf423be2a2091bf646acfa05f2ff228bc3706..47865eb607966961ee5707dde482194ba8d38af6 100755 (executable)
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -142,6 +142,13 @@ sub adjustconfig () {
         (
           "XENCONSOLED_TRACE" => "guest",
        );
+
+    my $xenstored = target_var($ho, 'xenstored');
+    if (defined $xenstored) {
+       $xenstored = "/usr/local/sbin/$xenstored" unless $xenstored =~ m{/};
+       push @commons_config, "XENSTORED", $xenstored;
+    }
+
     target_editfile_root($ho, $commons_config_file,
        sub { target_editfile_kvp_replace(@commons_config) });