Merge ~mwhudson/ubiquity:lp-1789920-bionic into ubiquity:bionic

[Michael Hudson-Doyle]

[Mathieu Trudel-Lapierre (cyphermox)]

review: Approve

diff --git a/bin/oem-config-remove b/bin/oem-config-remove
index 6fe9729..88f1caf 100755
--- a/bin/oem-config-remove
+++ b/bin/oem-config-remove
@@ -27,7 +27,11 @@ case $1 in
 			apt-get -y purge 'oem-config-slideshow-*' || true
 
 		debconf-apt-progress --stop
-		;;
+                # finish-install.d/01oem-config-udeb masks
+                # ubiquity.service so that [e-mail] runs as
+                # normal. Remove the clutter from that now.
+                rm -f /etc/systemd/system/ubiquity.service
+                ;;
 esac
 
 exit 0
diff --git a/debian/changelog b/debian/changelog
index 3bc6d64..def04bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubiquity (18.04.14.9) UNRELEASED; urgency=medium
+
+  * Mask ubiquity.service in a system installed with oem-config/enabled=true,
+    as this prevents [e-mail] from running. (LP: #1789920)
+
+ -- Michael Hudson-Doyle <[e-mail]>  Mon, 01 Oct 2018 12:38:20 +1300
+
 ubiquity (18.04.14.8) bionic; urgency=medium
 
   * Revert inclusion of package updates from cosmic.
diff --git a/finish-install.d/01oem-config-udeb b/finish-install.d/01oem-config-udeb
index afb94f4..16940ff 100755
--- a/finish-install.d/01oem-config-udeb
+++ b/finish-install.d/01oem-config-udeb
@@ -28,3 +28,6 @@ chroot /target debconf-set-selections <<EOF || true
 oem-config debian-installer/locale select $LOCALE
 oem-config debian-installer/framebuffer boolean $FRAMEBUFFER
 EOF
+# Disable ubiquity.service in the installed system as it conflicts with
+# [e-mail] which we want to run.
+chroot /target systemctl mask ubiquity.service