From 5232f2f8ccbcfb3489086dfb0ddc583c998955ed Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Thu, 22 Jul 2021 23:09:34 +1200
Subject: [PATCH] fix /media/filesystem mount

---
 .../usr/lib/systemd/system/media-filesystem.mount         | 8 ++++++--
 .../usr/lib/systemd/system/media-full.mount               | 5 +++++
 .../usr/lib/systemd/system/media-minimal.mount            | 5 +++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-full.mount
 create mode 100644 live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-minimal.mount

diff --git a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-filesystem.mount b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-filesystem.mount
index 82af906e..2570aaf2 100644
--- a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-filesystem.mount
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-filesystem.mount
@@ -1,5 +1,9 @@
+[Unit]
+Requires=media-full.mount media-minimal.mount
+After=media-full.mount media-minimal.mount
+
 [Mount]
 What=/cdrom/casper/ubuntu-server-minimal.ubuntu-server.squashfs
 Where=/media/filesystem
-Type=squashfs
-Options=ro
+Type=overlay
+Options=ro,lowerdir=/media/full:/media/minimal
diff --git a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-full.mount b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-full.mount
new file mode 100644
index 00000000..7c96a46e
--- /dev/null
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-full.mount
@@ -0,0 +1,5 @@
+[Mount]
+What=/cdrom/casper/ubuntu-server-minimal.ubuntu-server.squashfs
+Where=/media/full
+Type=squashfs
+Options=ro
diff --git a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-minimal.mount b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-minimal.mount
new file mode 100644
index 00000000..0d606898
--- /dev/null
+++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/usr/lib/systemd/system/media-minimal.mount
@@ -0,0 +1,5 @@
+[Mount]
+What=/cdrom/casper/ubuntu-server-minimal.squashfs
+Where=/media/minimal
+Type=squashfs
+Options=ro