- merged 2.12 from PLD

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

diff --git a/tld-sysconfdir.patch b/tld-sysconfdir.patch
index f53f128fb471fa30bb62dacead87b8f8b34d28e3..301f4c5e30d7bf1742c3ee9668c3557513884dc9 100644 (file)
--- a/tld-sysconfdir.patch
+++ b/tld-sysconfdir.patch
@@ -1,9 +1,9 @@
-diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
---- grub-2.00.orig/util/grub-mkconfig.in       2012-04-05 19:41:07.000000000 +0200
-+++ grub-2.00/util/grub-mkconfig.in    2012-10-27 14:53:33.483981202 +0200
-@@ -140,8 +140,8 @@
- # choosing Hurd filesystem module.
- GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || 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
 -  . ${sysconfdir}/default/grub
@@ -11,8 +11,8 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
 +  . ${sysconfdir}/sysconfig/grub
  fi
  
- # XXX: should this be deprecated at some point?
-@@ -232,7 +232,7 @@
+ 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
@@ -21,7 +21,7 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
  #
  EOF
  
-@@ -257,7 +257,7 @@
+@@ -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.
@@ -29,11 +29,11 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
 +Ensure that there are no errors in /etc/sysconfig/grub
  and /etc/grub.d/* files or please file a bug report with
  %s file attached." "${grub_cfg}.new" >&2
-   else
-diff -dur grub-2.00.orig/util/grub.d/README grub-2.00/util/grub.d/README
---- grub-2.00.orig/util/grub.d/README  2010-12-01 15:45:43.000000000 +0100
-+++ grub-2.00/util/grub.d/README       2012-10-27 14:52:54.046709588 +0200
-@@ -8,4 +8,4 @@
+     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