[xen stable-4.16] tools/oxenstored: Fix Oxenstored Live Update

[patchbot@xxxxxxx]

commit dae2ebabf81bfa1554a278ddc895ac0b3ccfcb6e
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Wed Oct 19 18:12:33 2022 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Mon Dec 12 11:04:12 2022 +0000

    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.torok@xxxxxxxxxx/
    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.cooper3@xxxxxxxxxx>
    Acked-by: Christian Lindig <christian.lindig@xxxxxxxxxx>
    Release-acked-by: Henry Wang <Henry.Wang@xxxxxxx>
    (cherry picked from commit 7110192b1df697be84a50f741651d4c3cb129504)
---
 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 c799e20f11..3e9f6ce5b2 100644
--- a/tools/ocaml/xenstored/xenstored.ml
+++ b/tools/ocaml/xenstored/xenstored.ml
@@ -418,6 +418,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";
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.16