Accepting request 751177 from home:michael-chang:branches:devel:openSUSE:Factory

- shim-install: add check for btrfs is used as root file system to enable
  relative path lookup for file. (bsc#1153953)

OBS-URL: https://build.opensuse.org/request/show/751177
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=154
This commit is contained in:
Gary Ching-Pang Lin 2019-11-27 07:50:22 +00:00 committed by Git OBS Bridge
parent 441cbe7c4c
commit 7ef93b059a
2 changed files with 12 additions and 1 deletions

View File

@ -294,8 +294,13 @@ make_grubcfg () {
grub_cfg_dirname=`dirname $grub_cfg`
grub_cfg_basename=`basename $grub_cfg`
cfg_fs_uuid=`"$grub_probe" --target=fs_uuid "$grub_cfg_dirname"`
# bsc#1153953 - Leap 42.3 boot error snapshot missing
# We have to check btrfs is used as root file system to enable relative path
# lookup for file to be on par with other utility which also accounts for it.
GRUB_FS="$(stat -f --printf=%T / || echo unknown)"
if test "x$SUSE_BTRFS_SNAPSHOT_BOOTING" = "xtrue"; then
if test "x$SUSE_BTRFS_SNAPSHOT_BOOTING" = "xtrue" &&
[ "x${GRUB_FS}" = "xbtrfs" ] ; then
cat <<EOF
set btrfs_relative_path="yes"
EOF

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 27 06:23:11 UTC 2019 - Michael Chang <mchang@suse.com>
- shim-install: add check for btrfs is used as root file system to enable
relative path lookup for file. (bsc#1153953)
-------------------------------------------------------------------
Fri Aug 16 04:07:30 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>