[xen master] tools: fix oom setting of xenstored

[patchbot@xxxxxxx]

commit 6809998c5f8f1d2e26ac9e867af8ac71e7a66cf2
Author:     Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Tue Oct 19 13:21:40 2021 +0200
Commit:     Ian Jackson <iwj@xxxxxxxxxxxxxx>
CommitDate: Tue Oct 19 12:23:34 2021 +0100

    tools: fix oom setting of xenstored
    
    Commit f282182af32939 ("tools/xenstore: set oom score for xenstore
    daemon on Linux") introduced a regression when not setting the oom
    value in the xencommons file. Fix that.
    
    Fixes: f282182af32939 ("tools/xenstore: set oom score for xenstore daemon 
on Linux")
    Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
    Reviewed-by: Ian Jackson <iwj@xxxxxxxxxxxxxx>
    Release-Acked-by: Ian Jackson <iwj@xxxxxxxxxxxxxx>
---
 tools/hotplug/Linux/launch-xenstore.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/hotplug/Linux/launch-xenstore.in 
b/tools/hotplug/Linux/launch-xenstore.in
index 8438af9977..e854ca1eb8 100644
--- a/tools/hotplug/Linux/launch-xenstore.in
+++ b/tools/hotplug/Linux/launch-xenstore.in
@@ -60,8 +60,7 @@ test -f @CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons && . 
@CONFIG_DIR@/@CONFIG_LEAF
                echo "No xenstored found"
                exit 1
        }
-       [ -z "$XENSTORED_OOM_MEM_THRESHOLD" ] || XENSTORED_OOM_MEM_THRESHOLD=50
-       XS_OOM_SCORE=-$(($XENSTORED_OOM_MEM_THRESHOLD * 10))
+       XS_OOM_SCORE=-$((${XENSTORED_OOM_MEM_THRESHOLD:-50} * 10))
 
        [ "$XENSTORED_MAX_OPEN_FDS" = "unlimited" ] || {
                [ -z "${XENSTORED_MAX_OPEN_FDS//[0-9]}" ] &&
--
generated by git-patchbot for /home/xen/git/xen.git#master