This commit is contained in:
committed by
Git OBS Bridge
parent
be29349429
commit
cf62e5ae4d
@@ -1,7 +1,7 @@
|
||||
Index: xen-3.1-testing/tools/python/xen/xend/XendBootloader.py
|
||||
Index: xen-3.2-testing/tools/python/xen/xend/XendBootloader.py
|
||||
===================================================================
|
||||
--- xen-3.1-testing.orig/tools/python/xen/xend/XendBootloader.py
|
||||
+++ xen-3.1-testing/tools/python/xen/xend/XendBootloader.py
|
||||
--- xen-3.2-testing.orig/tools/python/xen/xend/XendBootloader.py
|
||||
+++ xen-3.2-testing/tools/python/xen/xend/XendBootloader.py
|
||||
@@ -14,6 +14,7 @@
|
||||
|
||||
import os, select, errno, stat, signal
|
||||
@@ -25,10 +25,10 @@ Index: xen-3.1-testing/tools/python/xen/xend/XendBootloader.py
|
||||
+ if m:
|
||||
+ return vdisk == m.group(1) or vdisk == m.group(2)
|
||||
+ return True
|
||||
Index: xen-3.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
Index: xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
===================================================================
|
||||
--- xen-3.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
||||
+++ xen-3.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
--- xen-3.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
||||
+++ xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
@@ -42,7 +42,7 @@ from xen.xend import balloon, sxp, uuid,
|
||||
from xen.xend import XendOptions, XendNode, XendConfig
|
||||
|
||||
@@ -38,7 +38,7 @@ Index: xen-3.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
from xen.xend.XendError import XendError, VmError
|
||||
from xen.xend.XendDevices import XendDevices
|
||||
from xen.xend.XendTask import XendTask
|
||||
@@ -1859,8 +1859,11 @@ class XendDomainInfo:
|
||||
@@ -2009,8 +2009,11 @@ class XendDomainInfo:
|
||||
blexec = osdep.pygrub_path
|
||||
|
||||
blcfg = None
|
||||
|
Reference in New Issue
Block a user