Skip to contentSkip to conversation

remove dom0 name assumption in shutdown.py

PATCH In review [email protected] 2 participants 2 messages Nov 16, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remove dom0 name assumption in shutdown.py

# HG changeset patch
# User [email protected]
# Node ID 94a21101f5b1672736fe13746c156631dba96b9c
# Parent 9c7aeec94f8a085d69e6a4de9d5a27ebe98c0287
Dom0 might not be called Domain-0, so ask for the name in shutdown.py, instead of hardcoding it

Signed-off-by Jody Belka <knew (at) pimb (dot) org>
tools/python/xen/xm/shutdown.py +3 -2
diff -r 9c7aeec94f8a -r 94a21101f5b1 tools/python/xen/xm/shutdown.py
@@ -22,9 +22,9 @@
 import time
 
 from xen.xend.XendClient import server
+from xen.xend import sxp
 from xen.xm.opts import *
 
-DOM0_NAME = 'Domain-0'
 DOM0_ID = '0'
 
 gopts = Opts(use="""[options] [DOM]
@@ -54,7 +54,8 @@
 
 def shutdown(opts, doms, mode, wait):
     if doms == None: doms = server.xend_domains()
-    for x in [DOM0_NAME, DOM0_ID]:
+    dom0_name = sxp.child_value(server.xend_domain(0), 'name')
+    for x in [dom0_name, DOM0_ID]:
         if x in doms:
             doms.remove(x)
     for d in doms:
#1 lore raw
Quoted 5 lines · On Wed, Nov 16, 2005 at 01:18:29PM +0100, [email protected] wrote:

# HG changeset patch
# User [email protected]
# Node ID 94a21101f5b1672736fe13746c156631dba96b9c
# Parent 9c7aeec94f8a085d69e6a4de9d5a27ebe98c0287
Dom0 might not be called Domain-0, so ask for the name in shutdown.py, instead of hardcoding it

Thank you! Applied.

Ewan.