From 626f59a767fa68fb19c4208923381ee4291facc9 Mon Sep 17 00:00:00 2001
From: Walter Lapchynski <wxl@ubuntu.com>
Date: Wed, 19 Jun 2019 19:40:43 -0700
Subject: [PATCH] Work around update-initramfs issue and reorder jobs

Summary:
The initramfs job fails to build an initrd.img for two reasons:

1. No /boot/vmlinuz-$version
2. No /boot/initrd.img-$version

(1) is due to "contextualprocess@before_bootloader_mkdirs" needing to
be executed before "initramfs" because it copies in the kernel image
from /cdrom/casper/vmlinuz.

(2) is due to a bug in update-initramfs::get_sorted_versions() because
it expects there to be an existing initrd.img-$version despite the fact
the "initramfs" module is calling it with the -c (create) option, not
-u (update).

Closes (LP: #1829805)

Test Plan: Edited config in Live Environment and successfully rebooted into the installed OS.

Reviewers: wxl, tsimonq2

Reviewed By: wxl

Differential Revision: https://phab.lubuntu.me/D15
---
 debian/changelog                                 | 9 +++++++++
 lubuntu/modules/shellprocess_bug-LP#1829805.conf | 5 +++++
 lubuntu/settings.conf                            | 6 +++++-
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 lubuntu/modules/shellprocess_bug-LP#1829805.conf

diff --git a/debian/changelog b/debian/changelog
index b4ba730..290c867 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+calamares-settings-ubuntu (1:19.10.2) eoan; urgency=medium
+
+  * Fix initramfs job failing. Thanks to TJ for the fix! (LP: #1829805)
+    * Move before_bootloader_mkdirs process before initramfs.
+    * Workaround bug in update-initramfs::get_sorted_versions() with
+      shellprocess.
+
+ -- Walter Lapchynski <wxl@ubuntu.com>  Wed, 19 Jun 2019 19:32:14 -0700
+
 calamares-settings-ubuntu (1:19.10.1) eoan; urgency=medium
 
   * Welcome to the Eoan EANIMAL!
diff --git a/lubuntu/modules/shellprocess_bug-LP#1829805.conf b/lubuntu/modules/shellprocess_bug-LP#1829805.conf
new file mode 100644
index 0000000..1fbf34c
--- /dev/null
+++ b/lubuntu/modules/shellprocess_bug-LP#1829805.conf
@@ -0,0 +1,5 @@
+---
+dontChroot: false
+timeout: 30
+script:
+    - "touch @@ROOT@@/boot/initrd.img-$(uname -r)"
diff --git a/lubuntu/settings.conf b/lubuntu/settings.conf
index b5985ac..927b279 100644
--- a/lubuntu/settings.conf
+++ b/lubuntu/settings.conf
@@ -14,6 +14,9 @@ instances:
 - id: logs
   module: shellprocess
   config: shellprocess_logs.conf
+- id: bug-LP#1829805
+  module: shellprocess
+  config: shellprocess_bug-LP#1829805.conf
 
 sequence:
 - show:
@@ -37,10 +40,11 @@ sequence:
   - displaymanager
   - networkcfg
   - hwclock
+  - contextualprocess@before_bootloader_mkdirs
+  - shellprocess@bug-LP#1829805
   - initramfscfg
   - initramfs
   - grubcfg
-  - contextualprocess@before_bootloader_mkdirs
   - contextualprocess@before_bootloader
   - bootloader
   - contextualprocess@after_bootloader