Merge lp:~ltrager/maas-images/centos7_uefi into lp:maas-images

[Lee Trager]

Fix CentOS 7 Curtin hook when deploying to a UEFI AMD64 system

Test stream at http://162.213.35.187/combined/

[Andres Rodriguez (andreserl)]

lgtm! Tested, works just fine!

review: Approve

[Andres Rodriguez (andreserl)]

Actually, questions inline:

review: Needs Information

[Andres Rodriguez (andreserl)]

question was answered on IRC, so i'm good with his.

12:47 < blake_r> roaksoax: you don't need that stuff
12:47 < roaksoax> blake_r: why not ?
12:47 < blake_r> roaksoax: because its now mounted by default
12:47 < roaksoax> ok, you maen grub/curtin/the os handles that ?
12:47 < blake_r> yes

review: Approve

=== modified file 'conf/centos.yaml'
--- conf/centos.yaml	2016-09-17 00:28:38 +0000
+++ conf/centos.yaml	2017-04-25 08:12:18 +0000
@@ -20,6 +20,8 @@
          # EPEL7-testing
          - https://kojipkgs.fedoraproject.org/packages/python-oauth/1.0.1/10.el7/noarch/python-oauth-1.0.1-10.el7.noarch.rpm
          - linux-firmware
+         - grub2-efi-modules
+         - efibootmgr
     centos66:
         version: 6.6
         release_title: "CentOS 6.6"
 
=== modified file 'curtin/centos7/curtin-hooks.py'
--- curtin/centos7/curtin-hooks.py	2016-05-11 18:47:46 +0000
+++ curtin/centos7/curtin-hooks.py	2017-04-25 08:12:18 +0000
@@ -9,7 +9,6 @@
 import codecs
 import os
 import sys
-import shutil
 
 from curtin import (
     block,
@@ -72,14 +71,6 @@
     return blocks[rootdev]
 
 
-def get_uefi_partition():
-    """Return the UEFI partition."""
-    for _, value in block._lsblock().items():
-        if value['LABEL'] == 'uefi-boot':
-            return value
-    return None
-
-
 def read_file(path):
     """Returns content of a file."""
     with codecs.open(path, encoding='utf-8') as stream:
@@ -152,36 +143,13 @@
         in_chroot(['grub2-mkconfig', '-o', '/boot/grub2/grub.cfg'])
 
 
-def install_efi(target, uefi_path):
+def install_uefi(target):
     """Install the EFI data from /boot into efi partition."""
-    # Create temp mount point for uefi partition.
-    tmp_efi = os.path.join(target, 'boot', 'efi_part')
-    os.mkdir(tmp_efi)
-    util.subp(['mount', uefi_path, tmp_efi])
-
-    # Copy the data over.
-    try:
-        efi_path = os.path.join(target, 'boot', 'efi')
-        if os.path.exists(os.path.join(tmp_efi, 'EFI')):
-            shutil.rmtree(os.path.join(tmp_efi, 'EFI'))
-        shutil.copytree(
-            os.path.join(efi_path, 'EFI'),
-            os.path.join(tmp_efi, 'EFI'))
-    finally:
-        # Clean up tmp mount
-        util.subp(['umount', tmp_efi])
-        os.rmdir(tmp_efi)
-
-    # Mount and do grub install
-    util.subp(['mount', uefi_path, efi_path])
-    try:
-        with util.RunInChroot(target) as in_chroot:
-            in_chroot([
-                'grub2-install', '--target=x86_64-efi',
-                '--efi-directory', '/boot/efi',
-                '--recheck'])
-    finally:
-        util.subp(['umount', efi_path])
+    with util.RunInChroot(target) as in_chroot:
+        in_chroot([
+            'grub2-install', '--target=x86_64-efi',
+            '--efi-directory', '/boot/efi',
+            '--recheck'])
 
 
 def set_autorelabel(target):
@@ -315,11 +283,7 @@
         target, extra=get_extra_kernel_parameters())
     grub2_mkconfig(target)
     if util.is_uefi_bootable():
-        uefi_part = get_uefi_partition()
-        if uefi_part is None:
-            print('Unable to determine UEFI parition.')
-            sys.exit(1)
-        install_efi(target, uefi_part['device_path'])
+        install_uefi(target)
     else:
         for dev in devices:
             grub2_install(target, dev)
 
=== modified file 'meph2/ubuntu_info.py'
--- meph2/ubuntu_info.py	2016-04-25 20:07:36 +0000
+++ meph2/ubuntu_info.py	2017-04-25 08:12:18 +0000
@@ -96,6 +96,7 @@
     try:
         devel = udi.devel(date=date)
     except distro_info.DistroDataOutdated as e:
+        import sys
         sys.stderr.write(
             "WARN: distro_info.UbuntuDistroInfo() raised exception (%s). "
             "Using stable release as devel.\n" % e)