rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 245739 from home:michael-chang:branches:Base:System

Browse Source 
- fix openqa boot error on separate boot partition
  * refresh grub2-btrfs-05-grub2-mkconfig.patch

OBS-URL: https://build.opensuse.org/request/show/245739
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=108
This commit is contained in:
Michael Chang 2014-08-22 10:19:46 +00:00 committed by Git OBS Bridge
parent f605727964
commit a3e47f6d4e
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
grub2-btrfs-05-grub2-mkconfig.patch
View File

@ -100,19 +100,6 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
fi;;
xzfs)
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
@@ -194,6 +198,12 @@ while [ "x$list" != "x" ] ; do
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
+ if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
+ [ "x${GRUB_FS}" = "xbtrfs" ] ; then
+ rel_dirname="\${btrfs_subvol}$dirname"
+ else
+ rel_dirname="$dirname"
+ fi
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
alt_version=`echo $version | sed -e "s,\.old$,,g"`
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
===================================================================
--- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 22 10:05:13 UTC 2014 - mchang@suse.com
- fix openqa boot error on separate boot partition
* refresh grub2-btrfs-05-grub2-mkconfig.patch
-------------------------------------------------------------------
Thu Aug 21 06:10:07 UTC 2014 - mchang@suse.com