You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tashi-commits@incubator.apache.org by st...@apache.org on 2010/11/10 20:00:44 UTC
svn commit: r1033683 -
/incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py
Author: stroucki
Date: Wed Nov 10 20:00:43 2010
New Revision: 1033683
URL: http://svn.apache.org/viewvc?rev=1033683&view=rev
Log:
Change hardcoded xvda1's to value of diskU
Modified:
incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py
Modified: incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py?rev=1033683&r1=1033682&r2=1033683&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py Wed Nov 10 20:00:43 2010
@@ -244,8 +244,8 @@ usbdevice='tablet'
shadow_memory=8
'''
rootconfig = '''
-root='/dev/xvda1 ro'
-'''
+root='/dev/%s ro'
+'''%(diskU)
diskconfig = '''
disk=['%s:%s,ioemu:%s,w']
'''%(disk0, image, diskU)
@@ -257,8 +257,8 @@ vif = [ 'type=ioemu,bridge=%s,mac=%s' ]
raise Exception, "Unknown vmType in hints: %s"%vmType
if rootconfig is None:
rootconfig = '''
-root ='/dev/xvda1 ro'
-'''
+root ='/dev/%s ro'
+'''%(diskU)
if diskconfig is None:
diskconfig = '''
@@ -291,11 +291,11 @@ extra='xencons=tty'
f = open(fn, "w")
f.write(bootstr)
f.write(rootconfig)
- f.write(diskconfig)
f.write(netconfig)
f.write(memconfig)
f.write(cpuconfig)
# is root necessary? Only when using kernel directly
+ f.write(diskconfig)
f.write(extraconfig)
f.close()
return fn