From: Ian Jackson <iwj@xenproject.org>
Date: Fri, 22 Jan 2021 14:41:22 +0000 (+0000)
Subject: ts-xen-install: Honour xenstored target var
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bf418ad5a013021e1e9ac1eb7a2b2c74a2983a55;p=osstest.git

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 9e85303..a0ca694 100644
--- 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 fc4bf42..47865eb 100755
--- 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) });