manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi-image: Fix missing part_* modules in boot<platform>.efi 

Setting the value of PARTITIONLIST in a sub-shell is scoped to the
sub-shell, it will not change the value of the variable in the parent
shell.

In other words:

    #!/bin/sh
    FOOBAR=
    (FOOBAR=foo)
    echo FOOBAR=$FOOBAR

gives the output:

    FOOBAR=

As a consequence, PARTITIONLIST being empty, there are no part_*
modules embedded in the boot<platform>.efi binary. This is clearly a
regression, introduced in 7b36f5b0ad.

Somehow, Debian doesn't seem to be impacted. Kali Linux is impacted, but
only under very special conditions, leading to this bug report:
<https://bugs.kali.org/view.php?id=8441>

This commit fixes it, by setting the PARTITIONLIST variable first, and
then using it where needs be. As a consequence it greatly simplifies the
next part of the code, as we can just use a heredoc to create the grub
config.
This commit is contained in:
Arnaud Rebillout 2023-09-15 16:14:12 +07:00
parent 6f0f8952f9
commit a3f7a33f95
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/build/efi-image
View File

@ -56,17 +56,19 @@ EOF
# Set the timestamps # Set the timestamps
find $workdir -newermt "$(date -d@${SOURCE_DATE_EPOCH} '+%Y-%m-%d %H:%M:%S')" -exec touch '{}' -d@${SOURCE_DATE_EPOCH} ';' find $workdir -newermt "$(date -d@${SOURCE_DATE_EPOCH} '+%Y-%m-%d %H:%M:%S')" -exec touch '{}' -d@${SOURCE_DATE_EPOCH} ';'
mkdir -p "$outdir/boot/grub/$platform"
# All partition modules will be activated, unless UEFI secure boot is active (they are not signed) # All partition modules will be activated, unless UEFI secure boot is active (they are not signed)
PARTITIONLIST="" PARTITIONLIST=""
(echo "if [ x$grub_platform == xefi -a x$lockdown != xy ] ; then "; \ for i in /usr/lib/grub/$platform/part_*.mod; do
for i in /usr/lib/grub/$platform/part_*.mod; do i=$(echo $i | sed 's?^.*/??g;s?\.mod$??g;')
i=`echo $i | sed 's?^.*/??g;s?\.mod$??g;'` PARTITIONLIST="$PARTITIONLIST $i"
echo "insmod $i" done
PARTITIONLIST="${PARTITIONLIST} $i" mkdir -p "$outdir/boot/grub/$platform"
done; \ cat >"$outdir/boot/grub/$platform/grub.cfg" <<EOF
echo "fi"; \ if [ x$grub_platform == xefi -a x$lockdown != xy ] ; then
echo "source /boot/grub/grub.cfg") >"$outdir/boot/grub/$platform/grub.cfg" $(printf " insmod %s\n" $PARTITIONLIST)
fi
source /boot/grub/grub.cfg
EOF
# Build the core image. # Build the core image.
(cd "$workdir"; tar -cf - boot) >"$memdisk_img" (cd "$workdir"; tar -cf - boot) >"$memdisk_img"