VMBuilder

Merge lp://staging/~guilhem-fr/vmbuilder/oneiric-support into lp://staging/vmbuilder

oneiric-support
Merge into 0.12

Proposed by Guilhem Lettron on 2012-01-24

Status:

Needs review

Proposed branch:

lp://staging/~guilhem-fr/vmbuilder/oneiric-support

Merge into:

lp://staging/vmbuilder

Diff against target:

1849 lines (+729/-243)

26 files modified

VMBuilder/contrib/cli.py (+35/-22)
VMBuilder/disk.py (+90/-39)
VMBuilder/distro.py (+23/-15)
VMBuilder/hypervisor.py (+33/-18)
VMBuilder/plugins/__init__.py (+3/-1)
VMBuilder/plugins/ec2/__init__.py (+11/-11)
VMBuilder/plugins/kvm/__init__.py (+1/-1)
VMBuilder/plugins/kvm/disk.py (+38/-0)
VMBuilder/plugins/kvm/qemu_nbd.py (+117/-0)
VMBuilder/plugins/kvm/vm.py (+4/-0)
VMBuilder/plugins/ubuntu/dapper.py (+138/-34)
VMBuilder/plugins/ubuntu/distro.py (+76/-59)
VMBuilder/plugins/ubuntu/intrepid.py (+1/-0)
VMBuilder/plugins/ubuntu/karmic.py (+1/-0)
VMBuilder/plugins/ubuntu/lucid.py (+29/-1)
VMBuilder/plugins/ubuntu/oneiric.py (+22/-1)
VMBuilder/plugins/ubuntu/precise.py (+22/-0)
VMBuilder/plugins/ubuntu/templates/Copy of devicemap.tmpl (+17/-0)
VMBuilder/plugins/ubuntu/templates/devicemap.tmpl (+9/-3)
VMBuilder/plugins/ubuntu/templates/grubcfg.tmpl (+8/-0)
VMBuilder/plugins/ubuntu/templates/loadcfg.tmpl (+3/-0)
VMBuilder/plugins/ubuntu/templates/sources.list.tmpl (+10/-0)
VMBuilder/tests/disk_tests.py (+7/-7)
VMBuilder/tests/plugin_tests.py (+28/-28)
VMBuilder/util.py (+1/-1)
VMBuilder/vm.py (+2/-2)

To merge this branch:

bzr merge lp://staging/~guilhem-fr/vmbuilder/oneiric-support

Related bugs:

Bug #509609: grub2 support for guests >= karmic	Medium	Triaged
Bug #854741: VMBuilder not compatible with Ubuntu Oneiric	Undecided	New

Link a bug report

Reviewer	Date Requested	Status
Scott Moser	2012-01-26	Pending
VMBuilder	2012-01-24	Pending
Review via email: mp+89858@code.staging.launchpad.net

Description of the change

I change many work for grub2.

I cleanup code in the previous behaviour.
But, to be more "clean", I use another way for KVM hypervisor by using module "nbd" and "qemu-img" (who are dedicated to do this).

Any of my patches must break compatibility, but have a look and don't hesitate to critizise.

FYI, I use it in daily production cloud for my company.

Some parts need some works (especially ended scripts : /etc/fstab and device.map) but nothing blocking for me.

Revision history for this message

Guilhem Lettron (guilhem-fr) wrote on 2012-01-24:

oops for .projects files... they must be ignored (work on eclipse IDE).

Revision history for this message

Serge Hallyn (serge-hallyn) wrote on 2012-01-25:

Hi,

Thanks for working on this tree.

I've resolved the conflicts and pushed the result to lp:~serge-hallyn/vmbuilder/merge-guilhem-fr.

I've not yet done any testing of the result.

Could you please elaborate upon:

Some parts need some works (especially ended scripts : /etc/fstab and device.map) but nothing blocking for me.

Is that extra work just for cleanliness, or will things be broken without it?

Revision history for this message

Guilhem Lettron (guilhem-fr) wrote on 2012-01-25:

My solution works "out of the box".

To precise what I will do :
* fstab isn't "beautiful". It use /dev/sda[0-1] instead of UUID=****. UUID is usefull when you use virtio (/dev/vda**) as I do.
But VM work fine even if you don't have /dev/vda*

* when you boot for the first time VM, grub show you many fake system (generate from the host). But the first one is the good one, so no problem "out of the box".
I have work many hours to find the problem... but without any succes.
An "update-grub" in the VM clear all the fake.

So for me, my patches solve more problem than they give.

A last things to do for better use, is to prevent user (of KVM) when module "nbd" isn't load.

I don't find any python library to do this... suggestion ?

lp://staging/~guilhem-fr/vmbuilder/oneiric-support updated on 2012-09-04

471. By Guilhem Lettron on 2012-09-04: big changes :
* add precise
* let parted do a _good_ alignment
* ...
472. By Guilhem Lettron on 2012-09-04: merge
473. By Guilhem Lettron on 2012-09-04: no idea what I do #meme

Unmerged revisions

473. By Guilhem Lettron on 2012-09-04: no idea what I do #meme
472. By Guilhem Lettron on 2012-09-04: merge
471. By Guilhem Lettron on 2012-09-04: big changes :
* add precise
* let parted do a _good_ alignment
* ...