From ec8d1863c8ae49a73cff15547aa773e02d953dfa Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Wed, 25 Jul 2018 06:22:48 -0500
Subject: [PATCH] Make "ubuntu" the bootloader_id and don't do a cp hack.

---
 debian/changelog                              | 1 +
 lubuntu/modules/after_bootloader_context.conf | 5 -----
 lubuntu/modules/bootloader.conf               | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9118109..b4f6e32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 calamares-settings-ubuntu (14) UNRELEASED; urgency=medium
 
   * Don't copy initrd from the live install, because that contains casper.
+  * Make "ubuntu" the bootloader_id and don't do a cp hack.
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 25 Jul 2018 06:19:24 -0500
 
diff --git a/lubuntu/modules/after_bootloader_context.conf b/lubuntu/modules/after_bootloader_context.conf
index a8a172d..2e9b8a7 100644
--- a/lubuntu/modules/after_bootloader_context.conf
+++ b/lubuntu/modules/after_bootloader_context.conf
@@ -7,11 +7,6 @@ dontChroot: false
 timeout: 120
 firmwareType:
     efi:
-    # grub hack
-    - -mkdir /boot/efi/EFI/ubuntu
-    - -cp /boot/efi/EFI/lubuntu/grub.cfg /boot/efi/EFI/ubuntu/
-    # normal user setup
     - -for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done
     bios:
-    # normal user setup
     - -for i in `ls @@ROOT@@/home/`; do rm @@ROOT@@/home/$i/Desktop/calamares.desktop || exit 0; done
diff --git a/lubuntu/modules/bootloader.conf b/lubuntu/modules/bootloader.conf
index 9aafcbd..6286d8e 100644
--- a/lubuntu/modules/bootloader.conf
+++ b/lubuntu/modules/bootloader.conf
@@ -30,4 +30,4 @@ grubCfg: "/boot/grub/grub.cfg"
 # setting the option here, take care to use only valid directory
 # names since no sanitizing is done.
 #
-efiBootloaderId: "lubuntu"
+efiBootloaderId: "ubuntu"