Merge lp:~chris-rassalon/vmbuilder/execscript into lp:vmbuilder

[Chris R. Jones]

Delays the execution of --execscript scripts until after just before the chroot fs is unmounted. This allows the user to do customization to the VM after all of its installation steps are complete, where currently, they have no ability to customize kernel, grub, network and filesytems mounts from their execscript.

[Serge Hallyn (serge-hallyn)]

Thanks for your time improving vmbuilder.

Please sign the contributor agreement so we can accept this patch.

https://wiki.canonical.com/LegalServices/Forms/ContributorAgreement

[Chris R. Jones (chris-rassalon)]

> Thanks for your time improving vmbuilder.
>
> Please sign the contributor agreement so we can accept this patch.
>
> https://wiki.canonical.com/LegalServices/Forms/ContributorAgreement

Sure, replied with the form through email. That link didn't work for me, but followed the directions at http://www.canonical.com/contributors. Let me know if you need something else.

[Serge Hallyn (serge-hallyn)]

Thanks very much, Chris. Pushing to oneiric right now.

review: Approve

=== modified file 'VMBuilder/distro.py'
--- VMBuilder/distro.py	2010-12-13 15:22:11 +0000
+++ VMBuilder/distro.py	2011-05-16 20:17:36 +0000
@@ -82,7 +82,6 @@
         self.call_hooks('set_defaults')
         self.call_hooks('bootstrap')
         self.call_hooks('configure_os')
-        self.call_hooks('post_install')
 	self.cleanup()
         
     def has_xen_support(self):

=== modified file 'VMBuilder/hypervisor.py'
--- VMBuilder/hypervisor.py	2010-04-07 19:47:58 +0000
+++ VMBuilder/hypervisor.py	2011-05-16 20:17:36 +0000
@@ -68,6 +68,7 @@
         if self.needs_bootloader:
             self.call_hooks('install_bootloader', self.chroot_dir, self.disks)
         self.call_hooks('install_kernel', self.chroot_dir)
+        self.distro.call_hooks('post_install')
         self.call_hooks('unmount_partitions')
         os.rmdir(self.chroot_dir)