forked from pool/grub2
165a6b361f
- snapper rollback support patches.
- rename patch
* 0002-btrfs-add-ability-to-boot-from-subvolumes.patch to
grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
* 0004-btrfs-export-subvolume-envvars.patch to
grub2-btrfs-02-export-subvolume-envvars.patch
- added patches
* grub2-btrfs-03-follow_default.patch
* grub2-btrfs-04-grub2-install.patch
* grub2-btrfs-05-grub2-mkconfig.patch
- remove patch
* 0003-cmdline-add-envvar-loader_cmdline_append.patch
OBS-URL: https://build.opensuse.org/request/show/245527
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=106
135 lines
4.5 KiB
Diff
135 lines
4.5 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@"
|
|
|
|
. "@datadir@/@PACKAGE@/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
|
|
EOF
|
|
@@ -356,3 +366,14 @@ fi
|
|
if [ "x${GRUB_BADRAM}" != "x" ] ; then
|
|
echo "badram ${GRUB_BADRAM}"
|
|
fi
|
|
+
|
|
+if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
|
|
+ [ "x${GRUB_FS}" = "xbtrfs" ] ; then
|
|
+ cat <<EOF
|
|
+if [ -n "\$extra_cmdline" ]; then
|
|
+ submenu "Bootable snapshot #\$snapshot_num" {
|
|
+ menuentry "If OK, run 'snapper rollback \$snapshot_num' 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
|
|
@@ -250,7 +250,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
|
|
@@ -53,10 +53,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`
|
|
@@ -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
|
|
+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in
|
|
@@ -67,10 +67,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`
|