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

Tweak the uuid search setup 

Not all arches may have a grub.cfg, it seems. Don't fail there.
This commit is contained in:
Steve McIntyre 2022-11-28 10:24:00 +00:00
parent d99baf29c5
commit 2ef9e57ec0
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -257,8 +257,10 @@ change_grub_cfg_uuid () {
# reliable - see #1024346 and #1024720 for examples where this # reliable - see #1024346 and #1024720 for examples where this
# fails. Instead, let's generate a UUID here and use that as a # fails. Instead, let's generate a UUID here and use that as a
# flag file. # flag file.
UUID=$(uuidgen) if [ -f $CDDIR/EFI/debian/grub.cfg ]; then
mkdir -p $CDDIR/.disk/id UUID=$(uuidgen)
touch $CDDIR/.disk/id/$UUID mkdir -p $CDDIR/.disk/id
sed -i "/search --file --set=root/s,.disk/info,.disk/id/$UUID," $CDDIR/EFI/debian/grub.cfg touch $CDDIR/.disk/id/$UUID
sed -i "/search --file --set=root/s,.disk/info,.disk/id/$UUID," $CDDIR/EFI/debian/grub.cfg
fi
} }

10
tools/boot/bullseye/common.sh
View File

@ -231,8 +231,10 @@ change_grub_cfg_uuid () {
# reliable - see #1024346 and #1024720 for examples where this # reliable - see #1024346 and #1024720 for examples where this
# fails. Instead, let's generate a UUID here and use that as a # fails. Instead, let's generate a UUID here and use that as a
# flag file. # flag file.
UUID=$(uuidgen) if [ -f $CDDIR/EFI/debian/grub.cfg ]; then
mkdir -p $CDDIR/.disk/id UUID=$(uuidgen)
touch $CDDIR/.disk/id/$UUID mkdir -p $CDDIR/.disk/id
sed -i "/search --file --set=root/s,.disk/info,.disk/id/$UUID," $CDDIR/EFI/debian/grub.cfg touch $CDDIR/.disk/id/$UUID
sed -i "/search --file --set=root/s,.disk/info,.disk/id/$UUID," $CDDIR/EFI/debian/grub.cfg
fi
} }