svn commit: r948264 - in /incubator/tashi/trunk: etc/NodeManager.cfg src/tashi/nodemanager/vmcontrol/xenpv.py

[st...@apache.org]

Author: stroucki
Date: Wed May 26 00:12:44 2010
New Revision: 948264

URL: http://svn.apache.org/viewvc?rev=948264&view=rev
Log:
make pygrub the default and specify location of pygrub

Modified:
    incubator/tashi/trunk/etc/NodeManager.cfg
    incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py

Modified: incubator/tashi/trunk/etc/NodeManager.cfg
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/etc/NodeManager.cfg?rev=948264&r1=948263&r2=948264&view=diff
==============================================================================
--- incubator/tashi/trunk/etc/NodeManager.cfg (original)
+++ incubator/tashi/trunk/etc/NodeManager.cfg Wed May 26 00:12:44 2010
@@ -46,9 +46,10 @@ prefix = /dfs
 [XenPV]
 vmNamePrefix = tashi
 transientdir = /tmp
-defaultVmType = kernel
-defaultKernel = /boot/vmlinuz-xen
-defaultRamdisk = /boot/initrd-xen
+defaultVmType = pygrub
+#defaultVmType = kernel
+#defaultKernel = /boot/vmlinuz-xen
+#defaultRamdisk = /boot/initrd-xen
 defaultDiskType=qcow
 
 [NodeManagerService]

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=948264&r1=948263&r2=948264&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/vmcontrol/xenpv.py Wed May 26 00:12:44 2010
@@ -176,7 +176,7 @@ extra='xencons=tty'
 	
 		elif vmType == 'pygrub':
 			bootstr = '''
-bootloader="/usr/bin/pygrub"
+bootloader="/usr/lib/xen-default/bin/pygrub"
 disk=['tap:qcow:%s,xvda1,w']
 vif = [ 'bridge=%s,mac=%s' ]
 memory=%i