Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix install_firmwares_initrd to not fail when the firmware is not found.

This commit is contained in:
Raphaël Hertzog 2022-08-05 09:12:54 +02:00
parent af49fe7832
commit bbeab52f9a
No known key found for this signature in database
GPG Key ID: 03881DABEBC29AB9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -13,6 +13,7 @@ debian-cd (3.1.36) UNRELEASED; urgency=medium
[ Raphaël Hertzog ] [ Raphaël Hertzog ]
* Add cryptsetup-initramfs to tools/generate_di+k_list as cryptsetup 2.4.0 * Add cryptsetup-initramfs to tools/generate_di+k_list as cryptsetup 2.4.0
dropped the recommends on the package and it's needed by d-i. dropped the recommends on the package and it's needed by d-i.
* Fix install_firmwares_initrd to not fail when the firmware is not found.
[ Wolfgang Schweer ] [ Wolfgang Schweer ]
* data/bookworm: Use Debian Edu 12 installer logo and syslinux splash image * data/bookworm: Use Debian Edu 12 installer logo and syslinux splash image

4
tools/boot/bookworm/common.sh
View File

@ -228,7 +228,7 @@ install_firmwares_initrd () {
regex="$2" regex="$2"
if [ "$FORCE_FIRMWARE"x = "1"x ]; then if [ "$FORCE_FIRMWARE"x = "1"x ]; then
FILES=`$BASEDIR/tools/catz ${MIRROR}/dists/${DI_DIST}/*/binary-${ARCH}/Packages.gz | \ FILES=`$BASEDIR/tools/catz ${MIRROR}/dists/${DI_DIST}/*/binary-${ARCH}/Packages.gz | \
grep-dctrl -Pe "$regex" -sFilename -n` grep-dctrl -Pe "$regex" -sFilename -n || true`
if [ -n "${FILES}" ]; then if [ -n "${FILES}" ]; then
echo " Adding firmwares from" ${FILES} echo " Adding firmwares from" ${FILES}
@ -243,6 +243,8 @@ install_firmwares_initrd () {
(cd ${FWDIR} ; find lib/firmware | cpio -oA -H newc -F $initrd) (cd ${FWDIR} ; find lib/firmware | cpio -oA -H newc -F $initrd)
gzip -9 $initrd gzip -9 $initrd
rm -fr $FWDIR rm -fr $FWDIR
else
echo " WARNING: Could not find firmware package(s) matching $regex"
fi fi
fi fi
} }