Fix non-secureboot UEFI installs on real hardware (LP: #1781015).

debian/changelog

@@ -1,3 +1,9 @@
+calamares-settings-ubuntu (10) UNRELEASED; urgency=medium
+
+  * Fix non-secureboot UEFI installs on real hardware (LP: #1781015).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 18 Jul 2018 23:17:38 -0500
+
 calamares-settings-ubuntu (9) cosmic; urgency=medium
 
   * Import additional translations from Weblate.

lubuntu/modules/shellprocess.conf

@@ -2,5 +2,5 @@ dontChroot: true
 timeout: 300
 script:
   - "cp /cdrom/casper/vmlinuz @@ROOT@@/boot/vmlinuz-$(uname -r)"
-  - "[ -d /sys/firmware/efi ] && chroot @@ROOT@@ apt-cdrom add -d=/media/apt/ && chroot @@ROOT@@ sed -e '/deb http/ s/^#*/#/' -i /etc/apt/sources.list && chroot @@ROOT@@ apt update && chroot @@ROOT@@ apt -y install grub-efi-amd64-bin && chroot @@ROOT@@ sed -i 's/#deb/deb/' /etc/apt/sources.list && sed -i '/deb cdrom/d' @@ROOT@@/etc/apt/sources.list || exit 0"
+  - "[ -d /sys/firmware/efi ] && mkdir -pv @@ROOT@@/media/cdrom && mount --bind /cdrom @@ROOT@@/media/cdrom && chroot @@ROOT@@ apt-cdrom add -m -d=/media/cdrom/ && chroot @@ROOT@@ sed -e '/deb http/ s/^#*/#/' -i /etc/apt/sources.list && chroot @@ROOT@@ apt update && chroot @@ROOT@@ apt -y install grub-efi && chroot @@ROOT@@ sed -i 's/#deb/deb/' /etc/apt/sources.list && sed -i '/deb cdrom/d' @@ROOT@@/etc/apt/sources.list && umount @@ROOT@@/media/cdrom && rmdir @@ROOT@@/media/cdrom || exit 0"
   - "for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done"