From cb430394e289fcfdaace8123aed4f76148041759 Mon Sep 17 00:00:00 2001 From: Matthew Drobnak Date: Thu, 6 Jun 2024 23:23:01 +0000 Subject: [PATCH] Update preserve_rom function to check if /tmp/cbfs-init.rom should be used. Signed-off-by: Matthew Drobnak --- initrd/etc/ash_functions | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/initrd/etc/ash_functions b/initrd/etc/ash_functions index 078c3bdd2..5e8784242 100644 --- a/initrd/etc/ash_functions +++ b/initrd/etc/ash_functions @@ -38,14 +38,19 @@ TRACE() { preserve_rom() { TRACE "Under /etc/ash_functions:preserve_rom" + if [ "$CONFIG_CBFS_VIA_FLASHROM" = "y" ]; then + CBFS_ARG=" -o /tmp/cbfs-init.rom" + else + CBFS_ARG="" + fi new_rom="$1" - old_files=`cbfs -t 50 -l 2>/dev/null | grep "^heads/"` + old_files=`cbfs -t 50 -l $CBFS_ARG 2>/dev/null | grep "^heads/"` for old_file in `echo $old_files`; do new_file=`cbfs.sh -o $1 -l | grep -x $old_file` if [ -z "$new_file" ]; then echo "+++ Adding $old_file to $1" - cbfs -t 50 -r $old_file >/tmp/rom.$$ \ + cbfs -t 50 $CBFS_ARG -r $old_file >/tmp/rom.$$ \ || die "Failed to read cbfs file from ROM" cbfs.sh -o $1 -a $old_file -f /tmp/rom.$$ \ || die "Failed to write cbfs file to new ROM file"