From 2cc0bed73bcfa90c168fdbefa351d0c4d1a38ba2 Mon Sep 17 00:00:00 2001
From: Dan Simmons <kc2bez@lubuntu.me>
Date: Mon, 27 Jan 2020 20:48:55 -0500
Subject: [PATCH] Add shellprocess for i386 multiarch

Summary:
Add shellprocess to enable i386.
Bump Standards-Version to 4.5.0.
This provides "plan B" to T143

Test Plan:
 1. Boot live media
 1. Try to install Steam in Discover and it should fail with "dependency resolution failed"
 1. Install Lubuntu
 1. Reboot
 1. `dpkg --print-foreign-architectures` returns `i386`
 1. Install Steam in Discover and it should just work

Reviewers: wxl, tsimonq2

Reviewed By: wxl

Differential Revision: https://phab.lubuntu.me/D75
---
 debian/changelog                             | 7 +++++++
 debian/control                               | 2 +-
 lubuntu/modules/shellprocess_add386arch.conf | 5 +++++
 lubuntu/settings.conf                        | 4 ++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 lubuntu/modules/shellprocess_add386arch.conf

diff --git a/debian/changelog b/debian/changelog
index 73c57a4..61efcb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+calamares-settings-ubuntu (1:20.04.2) focal; urgency=medium
+
+  * Add shellprocess to implement i386 multiarch.
+  * Bump Standards-Version to 4.5.0, no changes needed.
+
+ -- Dan Simmons <kc2bez@lubuntu.me>  Mon, 27 Jan 2020 20:46:44 -0500
+
 calamares-settings-ubuntu (1:20.04.1) focal; urgency=medium
 
   * Welcome to the Focal Fossa!
diff --git a/debian/control b/debian/control
index 6f0485c..a0e2bfb 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
 Build-Depends: debhelper (>= 12),
                intltool,
                qttools5-dev-tools
-Standards-Version: 4.4.0
+Standards-Version: 4.5.0
 Homepage: https://code.launchpad.net/ubuntu-calamares-settings
 Vcs-Git: https://git.launchpad.net/ubuntu-calamares-settings
 Vcs-Browser: https://git.launchpad.net/ubuntu-calamares-settings
diff --git a/lubuntu/modules/shellprocess_add386arch.conf b/lubuntu/modules/shellprocess_add386arch.conf
new file mode 100644
index 0000000..3d8e2fa
--- /dev/null
+++ b/lubuntu/modules/shellprocess_add386arch.conf
@@ -0,0 +1,5 @@
+---
+dontChroot: false
+timeout: 30
+script:
+    - command: "/usr/bin/dpkg --add-architecture i386"
diff --git a/lubuntu/settings.conf b/lubuntu/settings.conf
index 453a383..f9f2115 100644
--- a/lubuntu/settings.conf
+++ b/lubuntu/settings.conf
@@ -17,6 +17,9 @@ instances:
 - id: bug-LP#1829805
   module: shellprocess
   config: shellprocess_bug-LP#1829805.conf
+- id: add386arch
+  module: shellprocess
+  config: shellprocess_add386arch.conf
 
 sequence:
 - show:
@@ -49,6 +52,7 @@ sequence:
   - bootloader
   - contextualprocess@after_bootloader
   - automirror
+  - shellprocess@add386arch
   - packages
   - shellprocess@logs
   - umount