diff options
| author | Neil Williams <codehelp@debian.org> | 2015-08-16 18:24:58 +0200 |
|---|---|---|
| committer | Neil Williams <codehelp@debian.org> | 2015-08-16 18:24:58 +0200 |
| commit | 54212e6812319e288a9ecd1a4d032b23ea9ae4ea (patch) | |
| tree | a980be74cdf856de61523df193c92decb569ae88 /vmdebootstrap | |
| parent | 34252150c3ca24e1dc88712406f73f0a78d9ea55 (diff) | |
| download | vmdebootstrap-54212e6812319e288a9ecd1a4d032b23ea9ae4ea.tar.gz | |
fix mount operations around uefi
Diffstat (limited to 'vmdebootstrap')
| -rw-r--r-- | vmdebootstrap/grub.py | 3 | ||||
| -rw-r--r-- | vmdebootstrap/uefi.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/vmdebootstrap/grub.py b/vmdebootstrap/grub.py index e511462..e348a53 100644 --- a/vmdebootstrap/grub.py +++ b/vmdebootstrap/grub.py @@ -93,6 +93,7 @@ class GrubHandler(Base): def install_extra_grub_uefi(self, rootdir): extra = str(arch_table[self.settings['arch']]['extra']) if extra: + mount_wrapper(rootdir) target = arch_table[extra]['target'] grub_opts = "--target=%s" % target try: @@ -102,4 +103,4 @@ class GrubHandler(Base): logging.warning(exc) self.message( "Failed to configure grub-uefi for %s" % extra) - umount_wrapper(rootdir) + umount_wrapper(rootdir) diff --git a/vmdebootstrap/uefi.py b/vmdebootstrap/uefi.py index 215e97e..6f4b3bf 100644 --- a/vmdebootstrap/uefi.py +++ b/vmdebootstrap/uefi.py @@ -111,8 +111,8 @@ class Uefi(Base): 'set', '1', 'esp', 'on']) def prepare_esp(self, rootdir, bootdev): - bootdir = '%s/%s/%s' % (rootdir, 'boot', 'efi') + self.bootdir = '%s/%s/%s' % (rootdir, 'boot', 'efi') logging.debug("bootdir:%s", self.bootdir) self.mkfs(bootdev, fstype='vfat') - os.makedirs(bootdir) - return bootdir + os.makedirs(self.bootdir) + return self.bootdir |