49eb9d2678
- new upstream version 2.02~beta3
* highlights of user visible changes not yet present in openSUSE package
- arm-uboot now generates position independent self relocating image, so
single binary should run on all supported systems
- loader for Xen on aarch64. grub-mkconfig support was not in time for
beta3 yet.
- improved ZFS support (extensible_dataset, large_blocks, embedded_data,
hole_birth features)
- support for IPv6 Router Advertisements
- support for persistent memory (we do not overwrite it and pass correct
information to OS)
- try to display more specific icons for os-prober generated menu entries
- grub-install detects EFI bit size and selects correct platform (x86_64-efi
or i386-efi) independent of OS bit size; needs kernel 4.0 or higher.
- LVM RAID1 support
- xnu loader fixes which should make OS X menu entry generated by os-prober
work again
- ... and lot of fixes over entire tree
OBS-URL: https://build.opensuse.org/request/show/362771
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=205
137 lines
4.4 KiB
Diff
137 lines
4.4 KiB
Diff
---
|
|
util/grub-mkconfig.in | 3 ++-
|
|
util/grub-mkconfig_lib.in | 4 ++++
|
|
util/grub.d/00_header.in | 23 ++++++++++++++++++++++-
|
|
util/grub.d/10_linux.in | 11 ++++++++++-
|
|
util/grub.d/20_linux_xen.in | 4 ++++
|
|
5 files changed, 42 insertions(+), 3 deletions(-)
|
|
|
|
Index: grub-2.02~beta2/util/grub-mkconfig_lib.in
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/util/grub-mkconfig_lib.in
|
|
+++ grub-2.02~beta2/util/grub-mkconfig_lib.in
|
|
@@ -49,7 +49,11 @@ grub_warn ()
|
|
|
|
make_system_path_relative_to_its_root ()
|
|
{
|
|
+ if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] ; then
|
|
+ "${grub_mkrelpath}" -r "$1"
|
|
+ else
|
|
"${grub_mkrelpath}" "$1"
|
|
+ fi
|
|
}
|
|
|
|
is_path_readable_by_grub ()
|
|
Index: grub-2.02~beta2/util/grub.d/00_header.in
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/util/grub.d/00_header.in
|
|
+++ grub-2.02~beta2/util/grub.d/00_header.in
|
|
@@ -27,6 +27,14 @@ export TEXTDOMAINDIR="@localedir@"
|
|
|
|
. "$pkgdatadir/grub-mkconfig_lib"
|
|
|
|
+if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
|
|
+ [ "x${GRUB_FS}" = "xbtrfs" ] ; then
|
|
+ cat <<EOF
|
|
+set btrfs_relative_path="y"
|
|
+export btrfs_relative_path
|
|
+EOF
|
|
+fi
|
|
+
|
|
# Do this as early as possible, since other commands might depend on it.
|
|
# (e.g. the `loadfont' command might need lvm or raid modules)
|
|
for i in ${GRUB_PRELOAD_MODULES} ; do
|
|
@@ -43,7 +51,9 @@ if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved
|
|
if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi
|
|
|
|
cat << EOF
|
|
-if [ -s \$prefix/grubenv ]; then
|
|
+if [ -f \${config_directory}/grubenv ]; then
|
|
+ load_env -f \${config_directory}/grubenv
|
|
+elif [ -s \$prefix/grubenv ]; then
|
|
load_env
|
|
fi
|
|
|
|
@@ -367,3 +377,15 @@ fi
|
|
if [ "x${GRUB_BADRAM}" != "x" ] ; then
|
|
echo "badram ${GRUB_BADRAM}"
|
|
fi
|
|
+
|
|
+if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
|
|
+ [ "x${GRUB_FS}" = "xbtrfs" ] ; then
|
|
+ # Note: No $snapshot_num on *read-only* rollback! (bsc#901487)
|
|
+ cat <<EOF
|
|
+if [ -n "\$extra_cmdline" ]; then
|
|
+ submenu "Bootable snapshot #\$snapshot_num" {
|
|
+ menuentry "If OK, run 'snapper rollback' and reboot." { true; }
|
|
+ }
|
|
+fi
|
|
+EOF
|
|
+fi
|
|
Index: grub-2.02~beta2/util/grub-mkconfig.in
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/util/grub-mkconfig.in
|
|
+++ grub-2.02~beta2/util/grub-mkconfig.in
|
|
@@ -262,7 +262,8 @@ export GRUB_DEFAULT \
|
|
GRUB_OS_PROBER_SKIP_LIST \
|
|
GRUB_DISABLE_SUBMENU \
|
|
GRUB_CMDLINE_LINUX_RECOVERY \
|
|
- GRUB_USE_LINUXEFI
|
|
+ GRUB_USE_LINUXEFI \
|
|
+ SUSE_BTRFS_SNAPSHOT_BOOTING
|
|
|
|
if test "x${grub_cfg}" != "x"; then
|
|
rm -f "${grub_cfg}.new"
|
|
Index: grub-2.02~beta2/util/grub.d/10_linux.in
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/util/grub.d/10_linux.in
|
|
+++ grub-2.02~beta2/util/grub.d/10_linux.in
|
|
@@ -57,10 +57,14 @@ fi
|
|
|
|
case x"$GRUB_FS" in
|
|
xbtrfs)
|
|
+ if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ]; then
|
|
+ GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} \${extra_cmdline}"
|
|
+ else
|
|
rootsubvol="`make_system_path_relative_to_its_root /`"
|
|
rootsubvol="${rootsubvol#/}"
|
|
if [ "x${rootsubvol}" != x ]; then
|
|
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
|
|
+ fi
|
|
fi;;
|
|
xzfs)
|
|
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
|
|
@@ -236,7 +240,12 @@ while [ "x$list" != "x" ] ; do
|
|
if [ $PLATFORM != "emu" ]; then
|
|
hotkey=0
|
|
else
|
|
- rel_dirname=$dirname
|
|
+ if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
|
|
+ [ "x${GRUB_FS}" = "xbtrfs" ] ; then
|
|
+ rel_dirname="\${btrfs_subvol}$dirname"
|
|
+ else
|
|
+ rel_dirname="$dirname"
|
|
+ fi
|
|
fi
|
|
version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
|
|
alt_version=`echo $version | sed -e "s,\.old$,,g"`
|
|
Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in
|
|
+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in
|
|
@@ -71,10 +71,14 @@ fi
|
|
|
|
case x"$GRUB_FS" in
|
|
xbtrfs)
|
|
+ if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ]; then
|
|
+ GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} \${extra_cmdline}"
|
|
+ else
|
|
rootsubvol="`make_system_path_relative_to_its_root /`"
|
|
rootsubvol="${rootsubvol#/}"
|
|
if [ "x${rootsubvol}" != x ]; then
|
|
GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
|
|
+ fi
|
|
fi;;
|
|
xzfs)
|
|
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
|