From 0159a8c9679a1652355280271f9b6631b5fbddfa Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Wed, 12 Apr 2023 21:48:10 +0000
Subject: [PATCH] Imported 2.823

No reason for CPC update specified.
---
 debian/changelog       | 8 ++++++++
 live-build/auto/build  | 2 +-
 live-build/auto/config | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c552a566..92eb2d53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.823) lunar; urgency=medium
+
+  * Update infinite_scream URL to mastodon
+  * Make PROPOSED=1 builds work with NotAutomatic (lunar and later).
+    LP: #2016022.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 12 Apr 2023 10:40:56 -0700
+
 livecd-rootfs (2.822) lunar; urgency=medium
 
   [ jchittum ]
diff --git a/live-build/auto/build b/live-build/auto/build
index ddbb7332..8c7688a5 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -348,7 +348,7 @@ EOF
 	fi
 
 	if [ -d chroot/etc/apt/preferences.d.save ]; then
-		# https://twitter.com/infinite_scream
+		# https://mastodon.social/@scream@botsin.space
 		mv chroot/etc/apt/preferences.d.save/* chroot/etc/apt/preferences.d/
 		rmdir chroot/etc/apt/preferences.d.save
 	fi
diff --git a/live-build/auto/config b/live-build/auto/config
index a0a76838..483beeff 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1476,6 +1476,14 @@ deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed $LB_PARENT_ARCHIVE_AREAS
 EOF
 	cp -a config/archives/proposed.list.chroot \
 	      config/archives/proposed.list.binary
+
+	mkdir -p config/chroot_apt/
+	cat > config/chroot_apt/proposed.pref <<EOF
+# override for NotAutomatic: yes
+Package: *
+Pin: release a=*-proposed
+Pin-Priority: 500
+EOF
 fi
 
 case $PROJECT:${SUBPROJECT:-} in