From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 5 Oct 2007 21:32:38 +0000 (-0400)
Subject: Stuff that works is happy.
X-Git-Tag: sipb-xen-database/8~16
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/commitdiff_plain/c3a86308a12185d01d8c4c8e83667b4f883f0e8c

Stuff that works is happy.

svn path=/trunk/packages/sipb-xen-database/sipb-xen-database/; revision=104
---

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 94ae6cc..0c30eff 100644
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -25,7 +25,8 @@ if machine_type.hvm:
     kernel = 'hvmloader'
     builder = 'hvm'
     vnc = 1
-    device_model = 'qemu-dm'
+    vncpasswd = 'moocow'
+    device_model = '/usr/sbin/qemu-dm-sipb'
 else:
     kernel  = '/boot/vmlinuz-2.6.18-4-xen-amd64'
     ramdisk = '/boot/initrd.img-2.6.18-4-xen-amd64'
@@ -44,7 +45,7 @@ for n in machine.nics:
 disk = []
 
 for d in machine.disks:
-    device = 'xenvg/' + machine.name + '_' + d.guest_device_name
+    device = '/dev/xenvg/' + machine.name + '_' + d.guest_device_name
     dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
     disk.append(dspec)