Merge lp:~tinco-andringa/vmbuilder/vmbuilder into lp:vmbuilder

Proposed by Tinco Andringa on 2014-11-18
Status: Merged
Merged at revision: 493
Proposed branch: lp:~tinco-andringa/vmbuilder/vmbuilder
Merge into: lp:vmbuilder
Diff against target: 61 lines (+9/-8)
3 files modified
VMBuilder/hypervisor.py (+7/-3)
VMBuilder/plugins/ubuntu/dapper.py (+1/-1)
VMBuilder/plugins/ubuntu/templates/dapper_fstab.tmpl (+1/-4)
To merge this branch: bzr merge lp:~tinco-andringa/vmbuilder/vmbuilder
Reviewer Review Type Date Requested Status
VMBuilder 2014-11-18 Pending
Review via email: mp+242076@code.launchpad.net

Description of the change

It modifies the generated fstab to refer to partitions by UUID instead of by disk mount point.

Fixes 517067

To post a comment you must log in.
Serge Hallyn (serge-hallyn) wrote :

Thanks for submitting this proposed fix. However we cannot merge the request without a signed contirbuter agreement.

http://www.ubuntu.com/legal/contributors

Tinco Andringa (tinco-andringa) wrote :

Hi,

I've signed the contributors agreement now :)

Serge Hallyn (serge-hallyn) wrote :

Hi,

so sorry, somehow I hadn't gotten this update in email.

When I check the database however, it tells me that you did not sign the
agreement.

Tinco Andringa (tinco-andringa) wrote :

Could it be I signed as <email address hidden>, for my employer Phusion? I
remember I made the patch during working hours (I am allowed to contribute
to open source by my employer).

On Thu, Oct 29, 2015 at 2:24 PM, Serge Hallyn <email address hidden>
wrote:

> Hi,
>
> so sorry, somehow I hadn't gotten this update in email.
>
> When I check the database however, it tells me that you did not sign the
> agreement.
>
> --
> https://code.launchpad.net/~w-mail-4/vmbuilder/vmbuilder/+merge/242076
> You are the owner of lp:~w-mail-4/vmbuilder/vmbuilder.
>

Tinco Andringa (tinco-andringa) wrote :

Alright the tooling confused me a bit, I signed the agreement again but now
with a prettier launchpad id "tinco-andringa"

On Thu, Oct 29, 2015 at 2:30 PM, Tinco Andringa <email address hidden> wrote:

> Could it be I signed as <email address hidden>, for my employer Phusion? I
> remember I made the patch during working hours (I am allowed to contribute
> to open source by my employer).
>
> On Thu, Oct 29, 2015 at 2:24 PM, Serge Hallyn <email address hidden>
> wrote:
>
> > Hi,
> >
> > so sorry, somehow I hadn't gotten this update in email.
> >
> > When I check the database however, it tells me that you did not sign the
> > agreement.
> >
> > --
> > https://code.launchpad.net/~w-mail-4/vmbuilder/vmbuilder/+merge/242076
> > You are the owner of lp:~w-mail-4/vmbuilder/vmbuilder.
> >
>
> --
> https://code.launchpad.net/~w-mail-4/vmbuilder/vmbuilder/+merge/242076
> You are the owner of lp:~w-mail-4/vmbuilder/vmbuilder.
>

Serge Hallyn (serge-hallyn) wrote :

Hm, neither one is showing up yet. Let me follow up with someone who'd know.
thanks!

Tinco Andringa (tinco-andringa) wrote :

There was a field I didn't know what to do with, maybe it's making it not
show up:

Project contact

   - Please add the Canonical Project Manager or contact

I entered your name there, I didn't know what else..

On Thu, Oct 29, 2015 at 3:03 PM, Serge Hallyn <email address hidden>
wrote:

> Hm, neither one is showing up yet. Let me follow up with someone who'd
> know.
> thanks!
>
> --
>
> https://code.launchpad.net/~tinco-andringa/vmbuilder/vmbuilder/+merge/242076
> You are the owner of lp:~tinco-andringa/vmbuilder/vmbuilder.
>

Serge Hallyn (serge-hallyn) wrote :

It's possible that we need to wait for a human to see it.

I'll ping someone this afternoon.

Quoting Tinco Andringa (<email address hidden>):
> There was a field I didn't know what to do with, maybe it's making it not
> show up:
>
> Project contact
>
> - Please add the Canonical Project Manager or contact
>
>
> I entered your name there, I didn't know what else..
>
> On Thu, Oct 29, 2015 at 3:03 PM, Serge Hallyn <email address hidden>
> wrote:
>
> > Hm, neither one is showing up yet. Let me follow up with someone who'd
> > know.
> > thanks!
> >
> > --
> >
> > https://code.launchpad.net/~tinco-andringa/vmbuilder/vmbuilder/+merge/242076
> > You are the owner of lp:~tinco-andringa/vmbuilder/vmbuilder.
> >
>
> --
> https://code.launchpad.net/~tinco-andringa/vmbuilder/vmbuilder/+merge/242076
> Your team VMBuilder is requested to review the proposed merge of lp:~tinco-andringa/vmbuilder/vmbuilder into lp:vmbuilder.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~vmbuilder
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~vmbuilder
> More help : https://help.launchpad.net/ListHelp

Serge Hallyn (serge-hallyn) wrote :

It now shows up signed - thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'VMBuilder/hypervisor.py'
2--- VMBuilder/hypervisor.py 2011-05-16 20:00:30 +0000
3+++ VMBuilder/hypervisor.py 2014-11-18 14:55:49 +0000
4@@ -59,6 +59,7 @@
5 self.nics = [self.NIC()]
6 self.call_hooks('preflight_check')
7 self.call_hooks('configure_networking', self.nics)
8+ self.call_hooks('create_partitions')
9 self.call_hooks('configure_mounting', self.disks, self.filesystems)
10
11 self.chroot_dir = tmpdir()
12@@ -78,9 +79,8 @@
13 destdir)
14 self.call_hooks('deploy', destdir)
15
16- def mount_partitions(self, mntdir):
17- """Mounts all the vm's partitions and filesystems below .rootmnt"""
18- logging.info('Mounting target filesystems')
19+ def create_partitions(self):
20+ """Creates all the vms partitions and formats them """
21 for fs in self.filesystems:
22 fs.create()
23 fs.mkfs()
24@@ -89,6 +89,10 @@
25 disk.partition()
26 disk.map_partitions()
27 disk.mkfs()
28+
29+ def mount_partitions(self, mntdir):
30+ """Mounts all the vm's partitions and filesystems below .rootmnt"""
31+ logging.info('Mounting target filesystems')
32 fss = VMBuilder.disk.get_ordered_filesystems(self)
33 for fs in fss:
34 fs.mount(mntdir)
35
36=== modified file 'VMBuilder/plugins/ubuntu/dapper.py'
37--- VMBuilder/plugins/ubuntu/dapper.py 2013-03-06 08:56:30 +0000
38+++ VMBuilder/plugins/ubuntu/dapper.py 2014-11-18 14:55:49 +0000
39@@ -246,7 +246,7 @@
40 self.context.install_file('/etc/apt/apt.conf', '// Proxy added by vmbuilder\nAcquire::http { Proxy "%s"; };' % proxy)
41
42 def install_fstab(self, disks, filesystems):
43- self.install_from_template('/etc/fstab', 'dapper_fstab', { 'parts' : disk.get_ordered_partitions(disks), 'prefix' : self.disk_prefix })
44+ self.install_from_template('/etc/fstab', 'dapper_fstab', { 'parts' : disk.get_ordered_partitions(disks) })
45
46 def install_device_map(self):
47 self.install_from_template('/boot/grub/device.map', 'devicemap', { 'prefix' : self.disk_prefix })
48
49=== modified file 'VMBuilder/plugins/ubuntu/templates/dapper_fstab.tmpl'
50--- VMBuilder/plugins/ubuntu/templates/dapper_fstab.tmpl 2010-02-24 11:04:23 +0000
51+++ VMBuilder/plugins/ubuntu/templates/dapper_fstab.tmpl 2014-11-18 14:55:49 +0000
52@@ -3,8 +3,5 @@
53 # <file system> <mount point> <type> <options> <dump> <pass>
54 proc /proc proc defaults 0 0
55 #for $part in $parts
56-#echo '/dev/%s%-40s %-15s %-7s %-15s %d %d\n' % ($prefix, part.get_suffix(), part.mntpnt, part.fs.fstab_fstype(), part.fs.fstab_options(), 0, 0)
57-#*
58-echo "/dev/$prefix$part.get_suffix() $part.mntpnt $part.fs.fstab_fstype() $part.fs.fstab_options() 0 0
59-*#
60+UUID=$part.fs.uuid $part.mntpnt $part.fs.fstab_fstype() $part.fs.fstab_options() 0 0
61 #end for

Subscribers

People subscribed via source and target branches