From 5193bfb60fc0290d19f303de4daeb44247b4e184 Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Mon, 21 Nov 2022 23:48:18 +0000
Subject: [PATCH] Imported 2.793

No reason for CPC update specified.
---
 debian/changelog                              | 19 ++++++++++++++++---
 live-build/auto/build                         |  7 ++++++-
 live-build/functions                          | 17 +++++++++++++++++
 .../hooks.d/base/disk-image-uefi.binary       |  5 ++++-
 .../hooks.d/base/riscv64/grub/cmdline.cfg     |  4 ++++
 5 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/cmdline.cfg

diff --git a/debian/changelog b/debian/changelog
index e3795530..6dfb891d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
-livecd-rootfs (2.791+1) lunar; urgency=medium
+livecd-rootfs (2.793) lunar; urgency=medium
 
-  * add lunar
+  [ Heinrich Schuchardt ]
+  * riscv64: use efi=debug earlycon. RISC-V boards tend to boot slowly. We
+    should provide progress information when booting.
 
- -- Thomas Bechtold <thomas.bechtold@canonical.com>  Mon, 31 Oct 2022 10:35:03 +0100
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 16 Nov 2022 13:25:46 +0100
+
+livecd-rootfs (2.792) lunar; urgency=medium
+
+  [ Samir Akarioh ]
+  * feat: Add metadata on ubuntu-oci image.
+  * feat: Add Ubuntu user.
+
+  [ Utkarsh Gupta ]
+  * Remove whitespaces.
+
+ -- Utkarsh Gupta <utkarsh@ubuntu.com>  Mon, 14 Nov 2022 15:26:30 +0530
 
 livecd-rootfs (2.791) kinetic; urgency=medium
 
diff --git a/live-build/auto/build b/live-build/auto/build
index 9c1f0fc9..fbffed2c 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -462,7 +462,12 @@ EOF
 		fi
 
 		if [ "$PROJECT" = "ubuntu-oci" ]; then
-		    configure_oci chroot
+			if [ -n "$BUILDSTAMP" ]; then
+				configure_oci chroot "$BUILDSTAMP"
+			else
+				echo "The \$BUILDSTAMP variable is empty"
+				exit 1
+			fi
 		fi
 
 		configure_network_manager
diff --git a/live-build/functions b/live-build/functions
index a6fa5bf2..210a783c 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -922,6 +922,12 @@ configure_oci() {
     # at https://github.com/tianon/docker-brew-ubuntu-core/blob/master/update.sh
 
     local chroot=$1
+    local serial=$2
+
+    if [ ! -d "${chroot}" ]; then
+        echo "The chroot does not exist"
+        exit 1
+    fi
 
     echo "==== Configuring OCI ===="
 
@@ -930,6 +936,14 @@ configure_oci() {
     echo 'exit 101' >> ${chroot}/usr/sbin/policy-rc.d
     Chroot ${chroot} "chmod +x /usr/sbin/policy-rc.d"
 
+
+    # Inject a build stamp into the image
+    mkdir -p ${chroot}/etc/cloud
+    cat > ${chroot}/etc/cloud/build.info << EOF
+serial: $serial
+EOF
+
+
     # https://github.com/docker/docker/blob/9a9fc01af8fb5d98b8eec0740716226fadb3735c/contrib/mkimage/debootstrap#L54-L56
     Chroot ${chroot} "dpkg-divert --local --rename --add /sbin/initctl"
     cp -a ${chroot}/usr/sbin/policy-rc.d ${chroot}/sbin/initctl
@@ -971,7 +985,10 @@ configure_oci() {
     mkdir -p ${chroot}/run/systemd
     echo 'docker' > ${chroot}/run/systemd/container
 
+    # Create Ubuntu user
+    Chroot ${chroot} useradd ubuntu -U -u 1000 --comment Ubuntu --groups adm,audio,cdrom,dialout,dip,floppy,plugdev,sudo,video --shell /bin/bash -m
     rm -rf ${chroot}/var/cache/apt/*.bin
+
     echo "==== Configuring OCI done ===="
 }
 
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 141010d4..3c6bd3dd 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
@@ -240,6 +240,10 @@ install_grub() {
             # TODO grub-efi-riscv64 exists, but is not used by all the images yet
             if [ -n "${SUBARCH:-}" ]; then
                 # Per-device images
+                local my_d=$(dirname $(readlink -f ${0}))
+                echo "Adjusting GRUB defaults for ${ARCH}"
+                mkdir -p mountpoint/etc/default/grub.d/
+                cp ${my_d}/riscv64/grub/cmdline.cfg mountpoint/etc/default/grub.d/
                 case "${SUBARCH}" in
                     "icicle")
                         echo "Installing GRUB for ${SUBARCH} board"
@@ -271,7 +275,6 @@ install_grub() {
                         chroot mountpoint rm -f /boot/boot.scr
                         ;;
                     "nezha"|"licheerv")
-                        local my_d=$(dirname $(readlink -f ${0}))
                         echo "Reducing initramfs size for ${SUBARCH} board"
                         mkdir -p mountpoint/etc/initramfs-tools/conf.d/
                         cp ${my_d}/riscv64/initramfs-tools/modules_list.conf mountpoint/etc/initramfs-tools/conf.d/
diff --git a/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/cmdline.cfg b/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/cmdline.cfg
new file mode 100644
index 00000000..c8cf57d0
--- /dev/null
+++ b/live-build/ubuntu-cpc/hooks.d/base/riscv64/grub/cmdline.cfg
@@ -0,0 +1,4 @@
+# Booting on many riscv64 systems is slow. Let the user view progress.
+# For minimum output use
+# GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+GRUB_CMDLINE_LINUX_DEFAULT="efi=debug earlycon"