incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r1033684 - /incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py
Date Wed, 10 Nov 2010 20:00:48 GMT
Author: stroucki
Date: Wed Nov 10 20:00:48 2010
New Revision: 1033684

URL: http://svn.apache.org/viewvc?rev=1033684&view=rev
Log:
Merge branch 'master' of ssh://yogi.pdl.cmu.edu/h/stroucki/git/tashi

Conflicts:
	trunk/src/tashi/nodemanager/vmcontrol/xenpv.py

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=1033684&r1=1033683&r2=1033684&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:48 2010
@@ -290,12 +290,12 @@ extra='xencons=tty'
 #(bootloader, (kernel, extra), (kernel, ramdisk)), disk, vif, memory, vcpus, root, extra
 		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(rootconfig)
 		f.write(extraconfig)
 		f.close()
 		return fn



Mime
View raw message