From a3db0f439741dc01fd2de0314f61eadfd8f6c479 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Mon, 6 Dec 2021 12:44:07 +0100 Subject: [PATCH] flash-kernel: disable Armbian core's update_initramfs, it's already done - correct mechanism, wrong/bad variable name, but should work. Signed-off-by: Ricardo Pardini --- extensions/flash-kernel.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/extensions/flash-kernel.sh b/extensions/flash-kernel.sh index 55070f0e5e..57c7c95f63 100644 --- a/extensions/flash-kernel.sh +++ b/extensions/flash-kernel.sh @@ -16,12 +16,12 @@ function extension_prepare_config__prepare_flash_kernel() { export CLOUD_INIT_CONFIG_LOCATION="/boot/firmware" # use /boot/firmware for cloud-init as well export VER="${FK__PUBLISHED_KERNEL_VERSION}" # For the VERSION export EXTRA_BSP_NAME="${EXTRA_BSP_NAME}-fk${FK__PUBLISHED_KERNEL_VERSION}" # Unique bsp name. - echo "-- starting" >"${DEST}"/"${LOG_SUBPATH}"/flash-kernel.log # Zero out the log for this extension. + echo "-- starting" >"${DEST}"/"${LOG_SUBPATH}"/flash-kernel.log # Zero out the log for this extension. } function post_install_kernel_debs__install_kernel_and_flash_packages() { export INSTALL_ARMBIAN_FIRMWARE="no" # Disable Armbian-firmware install, which would happen after this method. - + if [[ "${FK__EXTRA_PACKAGES}" != "" ]]; then display_alert "Installing flash-kernel extra packages" "${FK__EXTRA_PACKAGES}" echo "-- install extra pkgs" >>"${DEST}"/"${LOG_SUBPATH}"/flash-kernel.log @@ -116,4 +116,7 @@ function pre_update_initramfs__setup_flash_kernel() { umount_chroot "$chroot_target/" rm "$chroot_target"/usr/bin/"$QEMU_BINARY" + + display_alert "Disabling Armbian-core update_initramfs, was already done above." "${EXTENSION}" + unset KERNELSOURCE # ugly. sorry. we'll have better mechanism for this soon. this is tested at lib/debootstrap.sh:844 }