Merge branch 'int/alex/riscv_no_beaglev_container' of https://git.launchpad.net/~alexghiti/livecd-rootfs into ubuntu/master

debian/changelog

@@ -2,6 +2,8 @@ livecd-rootfs (2.769) UNRELEASED; urgency=medium
 
   [ Alexandre Ghiti ]
   * Add support for the VisionFive and the Nezha boards
+  * Set FK_FORCE_CONTAINER for RISC-V images build to force flash-kernel
+    to run in a container.
 
   [ Thomas Bechtold ]
   * Revert "don't modify ssh_config for ubuntu-cpc projects (LP:1968873)"

live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary

@@ -230,7 +230,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 apt-get install -qqy grub-efi-riscv64 flash-kernel
+                        chroot mountpoint bash -c 'FK_FORCE_CONTAINER=yes apt-get install -qqy grub-efi-riscv64 flash-kernel'
                         efi_target=riscv64-efi
 
                         chroot mountpoint apt-get install -qqy nezha-boot0
@@ -264,7 +264,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 apt-get install -qqy grub-efi-riscv64 flash-kernel
+                        chroot mountpoint bash -c 'FK_FORCE_CONTAINER=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