# HG changeset patch
# User igor@book.xt.vpn
# Date 1237484561 -7200
# Node ID dd23766a87c6c0f0bb38e2863472a19bd0fd8689
# Parent  d68ff2fdea92995f088e0437eb730b3ba899908a
Minor fixes. Hvmlaoder now can be specified by its path in the netowrk config file.
Also slightly changed drbdadm call

diff -r d68ff2fdea92 -r dd23766a87c6 xen-drbd-start.py
--- a/xen-drbd-start.py	Tue Oct 14 11:33:59 2008 +0300
+++ b/xen-drbd-start.py	Thu Mar 19 19:42:41 2009 +0200
@@ -38,8 +38,13 @@
 	print "Can't find or interpret module %s with topology description" %(network)
 	sys.exit(1)
 
+try:
+    hvmloader
+except:
+    hvmloader='hvmloader'
+
 if domain_types[N] == 'hvm':
-    kernel='hvmloader'
+    kernel=hvmloader
     builder='hvm'
 
 try:
diff -r d68ff2fdea92 -r dd23766a87c6 xen-drbd.py
--- a/xen-drbd.py	Tue Oct 14 11:33:59 2008 +0300
+++ b/xen-drbd.py	Thu Mar 19 19:42:41 2009 +0200
@@ -79,7 +79,8 @@
     return res
 
 def get_drbd_state(resource,node):
-    res=run_now("drbdadm state %s | sed s@/.*@@" %resource, node).rstrip("\n")
+    #before DRBD 8.3.0: res=run_now("drbdadm state %s | sed s@/.*@@" %resource, node).rstrip("\n")
+    res=run_now("drbdadm role %s | sed s@/.*@@" %resource, node).rstrip("\n")
     if not res:
         res = -1
     return res