From be429d184fa1f6bfd4f2274c939f315141ac2e81 Mon Sep 17 00:00:00 2001
From: Simon Quigley <tsimonq2@ubuntu.com>
Date: Tue, 3 Jul 2018 16:04:42 -0500
Subject: [PATCH] Replace awful hack with a less hacky but still awful hack.

---
 debian/changelog                  | 2 ++
 lubuntu/modules/packages.conf     | 5 -----
 lubuntu/modules/shellprocess.conf | 5 +++++
 lubuntu/settings.conf             | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 lubuntu/modules/shellprocess.conf

diff --git a/debian/changelog b/debian/changelog
index 5b7293c..a1597bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ calamares-settings-ubuntu (3) UNRELEASED; urgency=medium
 
   * Bump Standards-version to 4.1.4, no changes needed.
   * Fix Vcs-* and Homepage to reflect the move off of GitHub.
+  * Allow Lubuntu to be installed on systems with no network and UEFI
+    systems.
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 10 May 2018 20:04:23 -0500
 
diff --git a/lubuntu/modules/packages.conf b/lubuntu/modules/packages.conf
index d3dc5df..652c7c3 100644
--- a/lubuntu/modules/packages.conf
+++ b/lubuntu/modules/packages.conf
@@ -2,8 +2,3 @@ backend: apt
 operations:
   - remove:
       - '^live-*'
-      - linux-generic
-      - linux-image*
-      - linux-headers*
-  - install:
-      - linux-generic
diff --git a/lubuntu/modules/shellprocess.conf b/lubuntu/modules/shellprocess.conf
new file mode 100644
index 0000000..33ed987
--- /dev/null
+++ b/lubuntu/modules/shellprocess.conf
@@ -0,0 +1,5 @@
+dontChroot: true
+timeout: 60
+script:
+  - "cp /cdrom/casper/vmlinuz @@ROOT@@/boot/vmlinuz-$(uname -r)"
+  - "[ -d /sys/firmware/efi ] && chroot @@ROOT@@ apt-cdrom add && 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"
diff --git a/lubuntu/settings.conf b/lubuntu/settings.conf
index fc5a96a..8ab8709 100644
--- a/lubuntu/settings.conf
+++ b/lubuntu/settings.conf
@@ -23,6 +23,7 @@ sequence:
   - networkcfg
   - hwclock
   - services
+  - shellprocess
   - initramfs
   - grubcfg
   - bootloader