machine_type = machine.type
cdrom = None
if 'cdrom_image' in locals():
- cdrom = models.CDROM.query().filter_by(name=cdrom_image).one()
+ cdrom = models.CDROM.query().filter_by(cdrom_id=cdrom_image).one()
check(cdrom is not None)
memory = machine.memory
extra = 'ro noresume'
extra += (' ip=%s::%s:%s:%s:eth0:off'
% (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name))
- extra += ' %s' % installer_options[1:-1]
+ extra += ' %s' % installer_options
root = '/dev/hdb1'
codepath = None
elif cdrom is not None:
- disk.append('phy:/etc/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r')
+ disk.append('phy:/dev/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r')
boot = 'd'
codepath = 'hvm'
device_model = '/usr/sbin/qemu-dm-sipb'
serial = "pty"
elif codepath == 'paravm':
- bootloader = '/usr/lib/xen-default/bin/pygrub'
+ bootloader = '/usr/bin/pygrub'
for n in machine.nics: