rpms/grub2
8
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-24 14:32:58 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

20-grub-install: Use relative paths for btrfs in BLS snippets

Browse source 
When SUSE_BTRFS_SNAPSHOT_BOOTING=true is set in /etc/default/grub, paths
to kernel and initrd images need to be relative. Since are used along with
snapper, configured so the default btrfs subvolume is the current snapshot.

Resolves: rhbz#1906191
This commit is contained in:
Eduardo 2021-06-30 11:38:27 +02:00 committed by Javier Martinez Canillas
parent 419340f25e
commit fbeda573a9
No known key found for this signature in database
GPG key ID: C751E590D63F3D69
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
20-grub.install
View file

@ -112,7 +112,12 @@ case "$COMMAND" in
LINUX="$(grep '^linux[ \t]' "${BLS_TARGET}" | sed -e 's,^linux[ \t]*,,')" LINUX="$(grep '^linux[ \t]' "${BLS_TARGET}" | sed -e 's,^linux[ \t]*,,')"
INITRD="$(grep '^initrd[ \t]' "${BLS_TARGET}" | sed -e 's,^initrd[ \t]*,,')" INITRD="$(grep '^initrd[ \t]' "${BLS_TARGET}" | sed -e 's,^initrd[ \t]*,,')"
LINUX_RELPATH="$(grub2-mkrelpath /boot${LINUX})" if [[ "$(grub2-probe --device $(grub2-probe --target=device /) --target=fs)" == "btrfs" &&
"${SUSE_BTRFS_SNAPSHOT_BOOTING}" == "true" ]]; then
LINUX_RELPATH="$(grub2-mkrelpath -r /boot${LINUX})"
else
LINUX_RELPATH="$(grub2-mkrelpath /boot${LINUX})"
fi
BOOTPREFIX="$(dirname ${LINUX_RELPATH})" BOOTPREFIX="$(dirname ${LINUX_RELPATH})"
ROOTPREFIX="$(dirname "/boot${LINUX}")" ROOTPREFIX="$(dirname "/boot${LINUX}")"