- merged 2.12 from PLD

[packages/grub2.git] / tld-sysconfdir.patch

diff --git a/tld-sysconfdir.patch b/tld-sysconfdir.patch
index f5f08096fe6fb00c4f0cb377dacb8737e6c1aae7..301f4c5e30d7bf1742c3ee9668c3557513884dc9 100644 (file)
--- a/tld-sysconfdir.patch
+++ b/tld-sysconfdir.patch
@@ -1,17 +1,8 @@
-diff -urNp grub-2.02-rc1.orig/util/grub.d/README grub-2.02-rc1/util/grub.d/README
---- grub-2.02-rc1.orig/util/grub.d/README      2017-02-03 19:17:48.000000000 +0000
-+++ grub-2.02-rc1/util/grub.d/README   2017-02-08 15:00:50.481320993 +0000
-@@ -8,4 +8,4 @@ All executable files in this directory a
- The number namespace in-between is configurable by system installer and/or
- administrator.  For example, you can add an entry to boot another OS as
- 01_otheros, 11_otheros, etc, depending on the position you want it to occupy in
--the menu; and then adjust the default setting via /etc/default/grub.
-+the menu; and then adjust the default setting via /etc/sysconfig/grub.
-diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkconfig.in
---- grub-2.02-rc1.orig/util/grub-mkconfig.in   2017-02-03 19:17:48.000000000 +0000
-+++ grub-2.02-rc1/util/grub-mkconfig.in        2017-02-08 15:00:50.481320993 +0000
-@@ -147,8 +147,8 @@ if [ x"$GRUB_FS" = xunknown ]; then
-     GRUB_FS="$(stat -f --printf=%T / || echo unknown)"
+diff -urNp -x '*.orig' grub-2.06.org/util/grub-mkconfig.in grub-2.06/util/grub-mkconfig.in
+--- grub-2.06.org/util/grub-mkconfig.in        2021-03-10 14:42:22.000000000 +0100
++++ grub-2.06/util/grub-mkconfig.in    2023-07-09 22:57:02.992264334 +0200
+@@ -157,8 +157,8 @@ if [ "x${GRUB_EARLY_INITRD_LINUX_STOCK}"
+       GRUB_EARLY_INITRD_LINUX_STOCK="intel-uc.img intel-ucode.img amd-uc.img amd-ucode.img early_ucode.cpio microcode.cpio"
  fi
  
 -if test -f ${sysconfdir}/default/grub ; then
@@ -20,8 +11,8 @@ diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkco
 +  . ${sysconfdir}/sysconfig/grub
  fi
  
- # XXX: should this be deprecated at some point?
-@@ -243,7 +243,7 @@ cat << EOF
+ if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
+@@ -267,7 +267,7 @@ cat << EOF
  # DO NOT EDIT THIS FILE
  #
  # It is automatically generated by $self using templates
@@ -30,7 +21,7 @@ diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkco
  #
  EOF
  
-@@ -269,7 +269,7 @@ if test "x${grub_cfg}" != "x" ; then
+@@ -293,7 +293,7 @@ if test "x${grub_cfg}" != "x" ; then
    if ! ${grub_script_check} ${grub_cfg}.new; then
      # TRANSLATORS: %s is replaced by filename
      gettext_printf "Syntax errors are detected in generated GRUB config file.
@@ -39,3 +30,12 @@ diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkco
  and /etc/grub.d/* files or please file a bug report with
  %s file attached." "${grub_cfg}.new" >&2
      echo >&2
+diff -urNp -x '*.orig' grub-2.06.org/util/grub.d/README grub-2.06/util/grub.d/README
+--- grub-2.06.org/util/grub.d/README   2018-11-24 18:13:02.000000000 +0100
++++ grub-2.06/util/grub.d/README       2023-07-09 22:57:02.992264334 +0200
+@@ -8,4 +8,4 @@ All executable files in this directory a
+ The number namespace in-between is configurable by system installer and/or
+ administrator.  For example, you can add an entry to boot another OS as
+ 01_otheros, 11_otheros, etc, depending on the position you want it to occupy in
+-the menu; and then adjust the default setting via /etc/default/grub.
++the menu; and then adjust the default setting via /etc/sysconfig/grub.