Merge lp:~cjwatson/vmbuilder/chroot-grub into lp:vmbuilder/trunk

[Colin Watson]

[Soren Hansen (soren)]

On Mon, Oct 05, 2009 at 11:10:25AM -0000, Colin Watson wrote:
> + def install_bootloader_cleanup(self):
> + self.vm.cancel_cleanup(self.install_bootloader_cleanup)

Clever! I can think of a bunch of places this would be useful.

The rest looks great as well. Thank you!

 merge approved

--
Soren Hansen |
Lead virtualisation engineer | Ubuntu Server Team
Canonical Ltd. | http://www.ubuntu.com/

review: Approve

[Colin Watson (cjwatson)]

On Thu, Oct 08, 2009 at 10:48:12AM -0000, Soren Hansen wrote:
> On Mon, Oct 05, 2009 at 11:10:25AM -0000, Colin Watson wrote:
> > + def install_bootloader_cleanup(self):
> > + self.vm.cancel_cleanup(self.install_bootloader_cleanup)
>
> Clever! I can think of a bunch of places this would be useful.

Not my idea, actually; I borrowed it from
VMBuilder.disk.Filesystem.umount. :-)

--
Colin Watson [<email address hidden>]

[Soren Hansen (soren)]

On Thu, Oct 08, 2009 at 10:54:11AM -0000, Colin Watson wrote:
>On Thu, Oct 08, 2009 at 10:48:12AM -0000, Soren Hansen wrote:
>> On Mon, Oct 05, 2009 at 11:10:25AM -0000, Colin Watson wrote:
>>> + def install_bootloader_cleanup(self):
>>> + self.vm.cancel_cleanup(self.install_bootloader_cleanup)
>>
>> Clever! I can think of a bunch of places this would be useful.
> Not my idea, actually; I borrowed it from
> VMBuilder.disk.Filesystem.umount. :-)

Wow, and "bzr blame" says I wrote that bit. Talk about a brief moment of
clarity :)

--
Soren Hansen |
Lead virtualisation engineer | Ubuntu Server Team
Canonical Ltd. | http://www.ubuntu.com/

=== modified file 'VMBuilder/plugins/ubuntu/distro.py'
--- VMBuilder/plugins/ubuntu/distro.py	2009-09-15 10:33:37 +0000
+++ VMBuilder/plugins/ubuntu/distro.py	2009-10-05 11:10:24 +0000
@@ -20,6 +20,7 @@
 import os
 import socket
 import types
+import shutil
 import VMBuilder
 from   VMBuilder           import register_distro, Distro
 from   VMBuilder.util      import run_cmd
@@ -155,15 +156,30 @@
     def use_virtio_net(self):
         return self.suite.virtio_net
 
+    def install_bootloader_cleanup(self):
+        self.vm.cancel_cleanup(self.install_bootloader_cleanup)
+        tmpdir = '%s/tmp/vmbuilder-grub' % self.destdir
+        for disk in os.listdir(tmpdir):
+            if disk != 'device.map':
+                run_cmd('umount', os.path.join(tmpdir, disk))
+        shutil.rmtree(tmpdir)
+
     def install_bootloader(self):
-        devmapfile = '%s/device.map' % self.vm.workdir
-        devmap = open(devmapfile, 'w')
+        tmpdir = '/tmp/vmbuilder-grub'
+        os.makedirs('%s%s' % (self.destdir, tmpdir))
+        self.vm.add_clean_cb(self.install_bootloader_cleanup)
+        devmapfile = os.path.join(tmpdir, 'device.map')
+        devmap = open('%s%s' % (self.destdir, devmapfile), 'w')
         for (disk, id) in zip(self.vm.disks, range(len(self.vm.disks))):
-            devmap.write("(hd%d) %s\n" % (id, disk.filename))
+            new_filename = os.path.join(tmpdir, os.path.basename(disk.filename))
+            open('%s%s' % (self.destdir, new_filename), 'w').close()
+            run_cmd('mount', '--bind', disk.filename, '%s%s' % (self.destdir, new_filename))
+            devmap.write("(hd%d) %s\n" % (id, new_filename))
         devmap.close()
-        run_cmd('grub', '--device-map=%s' % devmapfile, '--batch',  stdin='''root (hd0,0)
+        self.run_in_target('grub', '--device-map=%s' % devmapfile, '--batch',  stdin='''root (hd0,0)
 setup (hd0)
 EOT''')
+        self.install_bootloader_cleanup()
 
     def xen_kernel_version(self):
         if self.suite.xen_kernel_flavour: