From 6c6caa81aa1ee49f835c2efa966489c34ce81125 Mon Sep 17 00:00:00 2001 From: Nikolai Kostrigin Date: Mon, 5 Dec 2022 18:02:10 +0300 Subject: [PATCH] fix os-alt patch: replace obsolete variable gone long ago This fixes OS ALT patch which didn't implement upstream changes in time. [...] 2010-10-12 Robert Millan util/grub-mkconfig.in: Merge `GRUB_DISABLE_LINUX_RECOVERY' and `GRUB_DISABLE_NETBSD_RECOVERY' into a single `GRUB_DISABLE_RECOVERY' variable. All references updated. [...] Was not discovered until ALT#44387. Reported-by: Vera Blagoveschenskaya Link: https://bugzilla.altlinux.org/44387 Signed-off-by: Nikolai Kostrigin --- grub-2.04-os-alt.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-2.04-os-alt.patch b/grub-2.04-os-alt.patch index 3ec731539..0224abb64 100644 --- a/grub-2.04-os-alt.patch +++ b/grub-2.04-os-alt.patch @@ -174,7 +174,7 @@ index 4532266be..cd87856f5 100644 - linux_entry "${OS}" "${version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" + "${GRUB_CMDLINE_LINUX_DEFAULT}" $default -+ if [ "x${GRUB_DISABLE_LINUX_RECOVERY}" != "xtrue" ] && [ "x${GRUB_VMLINUZ_FAILSAFE}" != "xno" ] && [ "x${GRUB_VMLINUZ_FAILSAFE}" != "xfalse" ]; then ++ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ] && [ "x${GRUB_VMLINUZ_FAILSAFE}" != "xno" ] && [ "x${GRUB_VMLINUZ_FAILSAFE}" != "xfalse" ]; then + if [ $linux = "/boot/vmlinuz" ] || [ "x${GRUB_VMLINUZ_FAILSAFE}" != "xdefault" ]; then + linux_entry "${OS}" "${version}" recovery \ + "${GRUB_CMDLINE_LINUX}" $default -- 2.33.5