diff -Nru livecd-rootfs-2.765.13/debian/changelog livecd-rootfs-2.765.14/debian/changelog --- livecd-rootfs-2.765.13/debian/changelog 2022-11-21 10:18:14.000000000 +0000 +++ livecd-rootfs-2.765.14/debian/changelog 2022-12-12 10:00:56.000000000 +0000 @@ -1,3 +1,10 @@ +livecd-rootfs (2.765.14) jammy; urgency=medium + + [ Samir Akarioh ] + * feat: Add metadata on ubuntu-oci image. (LP: #1998229) + + -- Utkarsh Gupta Mon, 12 Dec 2022 15:30:56 +0530 + livecd-rootfs (2.765.13) jammy; urgency=medium [ Heinrich Schuchardt ] diff -Nru livecd-rootfs-2.765.13/live-build/auto/build livecd-rootfs-2.765.14/live-build/auto/build --- livecd-rootfs-2.765.13/live-build/auto/build 2022-11-21 10:01:00.000000000 +0000 +++ livecd-rootfs-2.765.14/live-build/auto/build 2022-12-12 10:00:53.000000000 +0000 @@ -462,7 +462,12 @@ 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 -Nru livecd-rootfs-2.765.13/live-build/functions livecd-rootfs-2.765.14/live-build/functions --- livecd-rootfs-2.765.13/live-build/functions 2022-11-21 10:01:00.000000000 +0000 +++ livecd-rootfs-2.765.14/live-build/functions 2022-12-12 10:00:56.000000000 +0000 @@ -922,6 +922,12 @@ # 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 @@ 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