Merge branch 'devel' of github.com:rocknsm/rock-createiso into devel

bootstrap.sh

@@ -18,7 +18,7 @@ else
   yum -y install epel-release
 fi
 
-yum -y install python-pip python-jinja2 python-simplejson genisoimage pykickstart createrepo rsync isomd5sum syslinux pigz mock fuseiso libguestfs-tools-c initial-setup-gui firstboot tree
+yum -y install python-pip python-jinja2 python-simplejson genisoimage pykickstart createrepo rsync isomd5sum syslinux pigz mock fuseiso libguestfs-tools-c initial-setup-gui firstboot tree grub2-efi-modules
 
 pip install pythonpy
 

grub.cfg.j2

@@ -26,6 +26,12 @@ set gfxpayload=keep
 insmod gzio
 insmod part_gpt
 insmod ext2
+insmod gfxterm
+terminal_output gfxterm
+insmod gfxterm_background
+insmod png
+loadfont /EFI/BOOT/fonts/unicode.pf2
+background_image -m stretch /EFI/BOOT/uefi_splash_rock.png
 
 set timeout=60
 ### END /etc/grub.d/00_header ###

master-iso.sh

@@ -132,9 +132,16 @@ EOF
       ${TMP_NEW}/EFI/BOOT/grub.cfg \
       ::/EFI/BOOT/grub.cfg
 
+  # Copy UEFI splash branding
+  cp ${SCRIPT_DIR}/images/uefi_splash_rock.png ${TMP_NEW}/EFI/BOOT/uefi_splash_rock.png
+
   # Copy boot splash branding
   cp ${SCRIPT_DIR}/images/splash_rock.png ${TMP_NEW}/isolinux/splash.png
 
+  # Setup UEFI branding
+  mkdir ${TMP_NEW}/EFI/BOOT/x86_64-efi
+  cp /usr/lib/grub/x86_64-efi/gfxterm_background.mod ${TMP_NEW}/EFI/BOOT/x86_64-efi/
+
   # Generate product image
   cd ${SCRIPT_DIR}/product
   find . | cpio -c -o 2>/dev/null| gzip -9cv > ../product.img 2>/dev/null