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

[Tinco Andringa]

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

Fixes 517067

[Serge Hallyn (serge-hallyn)]

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)]

Hi,

I've signed the contributors agreement now :)

[Serge Hallyn (serge-hallyn)]

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)]

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)]

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)]

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

[Tinco Andringa (tinco-andringa)]

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)]

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)]

It now shows up signed - thanks!

=== modified file 'VMBuilder/hypervisor.py'
--- VMBuilder/hypervisor.py	2011-05-16 20:00:30 +0000
+++ VMBuilder/hypervisor.py	2014-11-18 14:55:49 +0000
@@ -59,6 +59,7 @@
         self.nics = [self.NIC()]
         self.call_hooks('preflight_check')
         self.call_hooks('configure_networking', self.nics)
+        self.call_hooks('create_partitions')
         self.call_hooks('configure_mounting', self.disks, self.filesystems)
 
         self.chroot_dir = tmpdir()
@@ -78,9 +79,8 @@
                         destdir)
         self.call_hooks('deploy', destdir)
 
-    def mount_partitions(self, mntdir):
-        """Mounts all the vm's partitions and filesystems below .rootmnt"""
-        logging.info('Mounting target filesystems')
+    def create_partitions(self):
+        """Creates all the vms partitions and formats them """
         for fs in self.filesystems:
             fs.create()
             fs.mkfs()
@@ -89,6 +89,10 @@
             disk.partition()
             disk.map_partitions()
             disk.mkfs()
+
+    def mount_partitions(self, mntdir):
+        """Mounts all the vm's partitions and filesystems below .rootmnt"""
+        logging.info('Mounting target filesystems')
         fss = VMBuilder.disk.get_ordered_filesystems(self)
         for fs in fss:
             fs.mount(mntdir)

=== modified file 'VMBuilder/plugins/ubuntu/dapper.py'
--- VMBuilder/plugins/ubuntu/dapper.py	2013-03-06 08:56:30 +0000
+++ VMBuilder/plugins/ubuntu/dapper.py	2014-11-18 14:55:49 +0000
@@ -246,7 +246,7 @@
             self.context.install_file('/etc/apt/apt.conf', '// Proxy added by vmbuilder\nAcquire::http { Proxy "%s"; };' % proxy)
 
     def install_fstab(self, disks, filesystems):
-        self.install_from_template('/etc/fstab', 'dapper_fstab', { 'parts' : disk.get_ordered_partitions(disks), 'prefix' : self.disk_prefix })
+        self.install_from_template('/etc/fstab', 'dapper_fstab', { 'parts' : disk.get_ordered_partitions(disks) })
 
     def install_device_map(self):
         self.install_from_template('/boot/grub/device.map', 'devicemap', { 'prefix' : self.disk_prefix })

=== modified file 'VMBuilder/plugins/ubuntu/templates/dapper_fstab.tmpl'
--- VMBuilder/plugins/ubuntu/templates/dapper_fstab.tmpl	2010-02-24 11:04:23 +0000
+++ VMBuilder/plugins/ubuntu/templates/dapper_fstab.tmpl	2014-11-18 14:55:49 +0000
@@ -3,8 +3,5 @@
 # <file system>                                 <mount point>   <type>  <options>       <dump>  <pass>
 proc                                            /proc           proc    defaults        0       0
 #for $part in $parts
-#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)
-#*
-echo "/dev/$prefix$part.get_suffix()                                $part.mntpnt        $part.fs.fstab_fstype()    $part.fs.fstab_options()    0    0
-*#
+UUID=$part.fs.uuid                                $part.mntpnt        $part.fs.fstab_fstype()    $part.fs.fstab_options()    0    0
 #end for