Hi Andrew,

> -----Original Message-----
> From: Andrew Cooper <andrew.coop...@citrix.com>
> Subject: [PATCH for-4.17] tools/oxenstored: Fix Oxenstored Live Update
> 
> tl;dr This hunk was part of the patch emailed to xen-devel, but was missing
> from what ultimately got committed.
> 
> https://lore.kernel.org/xen-
> devel/4164cb728313c3b9fc38cf5e9ecb790ac93a9600.1610748224.git.edvin.t
> o...@citrix.com/
> is the patch in question, but was part of a series that had threading issues.
> I have a vague recollection that I sourced the commits from a local branch,
> which clearly wasn't as up-to-date as I had thought.
> 
> Either way, it's my fault/mistake, and this hunk should have been part of
> what
> got comitted.
> 
> Fixes: 00c48f57ab36 ("tools/oxenstored: Start live update process")
> Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
> ---
> CC: Christian Lindig <christian.lin...@citrix.com>
> CC: David Scott <d...@recoil.org>
> CC: Edwin Torok <edvin.to...@citrix.com>
> CC: Rob Hoes <rob.h...@citrix.com>
> CC: Henry Wang <henry.w...@arm.com>
> 
> Found while reviewing the XenServer patchqueue.  This is low risk for 4.17
> and
> fixes a feature which we thought had been working since 4.15.

The commit message and above scissors line have described the situation
quite clear, so I don't think there is any reason to ignore this patch.

Release-acked-by: Henry Wang <henry.w...@arm.com>

Kind regards,
Henry


> ---
>  tools/ocaml/xenstored/xenstored.ml | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/tools/ocaml/xenstored/xenstored.ml
> b/tools/ocaml/xenstored/xenstored.ml
> index d44ae673c42a..fc90fcdeb5d6 100644
> --- a/tools/ocaml/xenstored/xenstored.ml
> +++ b/tools/ocaml/xenstored/xenstored.ml
> @@ -352,6 +352,11 @@ let _ =
>               rw_sock
>       ) in
> 
> +     (* required for xenstore-control to detect availability of live-update 
> *)
> +     Store.mkdir store Perms.Connection.full_rights (Store.Path.of_string
> "/tool");
> +     Store.write store Perms.Connection.full_rights
> +             (Store.Path.of_string "/tool/xenstored")
> Sys.executable_name;
> +
>       Sys.set_signal Sys.sighup (Sys.Signal_handle sighup_handler);
>       Sys.set_signal Sys.sigterm (Sys.Signal_handle (fun _ ->
>               info "Received SIGTERM";
> --
> 2.11.0


Reply via email to