Skip to contentSkip to conversation

Fix regression in xendomains initscript: test for privcmd char device

PATCH Applied Sander Eikelenboom 3 participants 3 messages Dec 8, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix regression in xendomains initscript: test for privcmd char device

Since commit:
"xendomains initscript: test for privcmd char device" (1367e9e5ba4d1612e303123ec0bbf961100fcfa1)
due to incorrect negation the xendomains initscript bails out early when both: "/dev/xen/privcmd" and "/proc/xen/privcmd" are present in dom0.

---
 tools/hotplug/Linux/xendomains.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/hotplug/Linux/xendomains.in +1 -1
index 686f061..dfe0b33 100644
@@ -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 /dev/xen/privcmd ] || [ -e /proc/xen/privcmd ]; then
+if [ ! -e /dev/xen/privcmd ] && [ ! -e /proc/xen/privcmd ]; then
 	exit 0
 fi
 
Signature · 1 line
2.1.4
Acked-by on v1 1/1
#1 lore raw

Sander Eikelenboom writes ("[PATCH] Fix regression in xendomains initscript: test for privcmd char device"):

Quoted 6 lines

Since commit:
"xendomains initscript: test for privcmd char device" (1367e9e5ba4d1612e303123ec0bbf961100fcfa1)
due to incorrect negation the xendomains initscript bails out early when both: "/dev/xen/privcmd" and "/proc/xen/privcmd" are present in dom0.

Sorry for not spotting this bug when reading the patch before it was committed !

Ian.

Applied
#2 lore raw
Quoted 10 lines · Ian Jackson

Sander Eikelenboom writes ("[PATCH] Fix regression in xendomains
initscript: test for privcmd char device"):

Quoted 6 lines

Since commit:
"xendomains initscript: test for privcmd char device" (1367e9e5ba4d1612e303123ec0bbf961100fcfa1)
due to incorrect negation the xendomains initscript bails out early when both: "/dev/xen/privcmd" and "/proc/xen/privcmd" are present in dom0.

Applied, thanks.