[neon/neon/livecd-rootfs/Neon/release] /: Rename FK_FORCE_CONTAINER to FK_FORCE

[William Wilson]

Git commit 6939cb42d509c04614605cac0f4f4dafae2a4441 by William Wilson.
Committed on 19/10/2022 at 15:03.
Pushed by jriddell into branch 'Neon/release'.

Rename FK_FORCE_CONTAINER to FK_FORCE

M  +7    -0    debian/changelog
M  +2    -2    live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary

https://invent.kde.org/neon/neon/livecd-rootfs/commit/6939cb42d509c04614605cac0f4f4dafae2a4441

diff --git a/debian/changelog b/debian/changelog
index 65ee212c..e5a140de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.765.11) jammy; urgency=medium
+
+  * Rename FK_FORCE_CONTAINER into FK_FORCE as its role was extended to also
+    support chroot (LP: #1989194).
+
+ -- William 'jawn-smith' Wilson <jawn-smith at ubuntu.com>  Fri, 07 Oct 2022 09:49:30 -0500
+
 livecd-rootfs (2.765.10) jammy; urgency=medium
 
   * The ubuntustudio dkms hook is only created when we're building
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 f516e7a6..aaf4e401 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
@@ -231,7 +231,7 @@ install_grub() {
                         # This explains why we install flash-kernel here.
                         chroot mountpoint mkdir -p /etc/flash-kernel/
                         chroot mountpoint bash -c "echo 'Allwinner D1 Nezha' > /etc/flash-kernel/machine"
-                        chroot mountpoint bash -c 'FK_FORCE_CONTAINER=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
+                        chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
                         efi_target=riscv64-efi
 
                         chroot mountpoint apt-get install -qqy nezha-boot0
@@ -265,7 +265,7 @@ install_grub() {
                         # This explains why we install flash-kernel here.
                         chroot mountpoint mkdir -p /etc/flash-kernel/
                         chroot mountpoint bash -c "echo 'StarFive VisionFive V1' > /etc/flash-kernel/machine"
-                        chroot mountpoint bash -c 'FK_FORCE_CONTAINER=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
+                        chroot mountpoint bash -c 'FK_FORCE=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
                         efi_target=riscv64-efi
 
                         # factory u-boot requires a p3 partition with /boot/uEnv.txt file