From 66b89072d56eeaf77bcdf815abfb1f859151d7c1 Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Wed, 1 Mar 2023 21:48:09 +0000
Subject: [PATCH] Imported 2.806

No reason for CPC update specified.
---
 debian/changelog                                    | 13 +++++++++++++
 live-build/auto/config                              |  2 ++
 .../ubuntu-cpc/hooks.d/base/disk-image-uefi.binary  |  6 ++++++
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4fb74a0d..a2b9df8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+livecd-rootfs (2.806) lunar; urgency=medium
+
+  [ Sean Davis ]
+  * Remove snap base seed for xubuntu:minimal
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 28 Feb 2023 08:00:08 -0800
+
+livecd-rootfs (2.805) lunar; urgency=medium
+
+  * riscv64: set attribute required partition for firmware.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 27 Feb 2023 21:49:27 +1300
+
 livecd-rootfs (2.804) lunar; urgency=medium
 
   * Clarified with Erich that edubuntu should install ubuntu-desktop-minimal
diff --git a/live-build/auto/config b/live-build/auto/config
index 157f8b47..094aeddd 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1054,6 +1054,8 @@ case $PROJECT:${SUBPROJECT:-} in
 		;;
 	ubuntu-oci:*)
 		;;
+	xubuntu:minimal)
+		;;
 	*)
 		BASE_SEED='desktop'
 		;;
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
index 5bf703c9..bbe271ad 100755
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
@@ -84,12 +84,15 @@ create_partitions() {
                        --new=13:256:25575 \
                        --change-name=13:loader1 \
                        --typecode=13:B161E8AB-7D4B-4DB4-821C-4120A0554A35 \
+                       --attributes=13:set:0 \
                        --new=16:25576:32799 \
                        --change-name=16:loader2b \
                        --typecode=16:F79E76D9-AC98-418B-8F31-E17EA24FF07C \
+                       --attributes=16:set:0 \
                        --new=14:32800:43007 \
                        --change-name=14:loader2 \
                        --typecode=14:F4FA3898-3478-4941-887D-FCEC4E9E3C05 \
+                       --attributes=14:set:0 \
                        --new=15::+106M \
                        --typecode=15:ef00 \
                        --change-name=15:ESP \
@@ -104,6 +107,7 @@ create_partitions() {
                        --new=13:256:25575 \
                        --change-name=13:loader \
                        --typecode=13:ef02 \
+                       --attributes=13:set:0 \
                        --new=15::+106M \
                        --typecode=15:ef00 \
                        --change-name=15:ESP \
@@ -132,9 +136,11 @@ create_partitions() {
                        --new=13:34:2081 \
                        --change-name=13:loader1 \
                        --typecode=13:5B193300-FC78-40CD-8002-E86C45580B47 \
+                       --attributes=13:set:0 \
                        --new=14:2082:10239 \
                        --change-name=14:loader2 \
                        --typecode=14:2E54B353-1271-4842-806F-E436D6AF6985 \
+                       --attributes=14:set:0 \
                        --new=15::+106M \
                        --typecode=15:ef00 \
                        --new=12::+4M \