From: Doug Goldstein <cardoe@cardoe.com>
Date: Tue, 1 Dec 2015 19:27:55 +0000 (-0600)
Subject: xendomains initscript: test for privcmd char device
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2138
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1367e9e5ba4d1612e303123ec0bbf961100fcfa1;p=xen.git

xendomains initscript: test for privcmd char device

Allow the init script to continue if either the character device or the
proc file is available.

CC: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: Ian Campbell <ian.campbell@citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/hotplug/Linux/xendomains.in b/tools/hotplug/Linux/xendomains.in
index 0603842a87..686f061cac 100644
--- a/tools/hotplug/Linux/xendomains.in
+++ b/tools/hotplug/Linux/xendomains.in
@@ -45,7 +45,7 @@ fi
 
 # Correct exit code would probably be 5, but it's enough
 # if xend complains if we're not running as privileged domain
-if ! [ -e /proc/xen/privcmd ]; then
+if ! [ -e /dev/xen/privcmd ] || [ -e /proc/xen/privcmd ]; then
 	exit 0
 fi