X-Git-Url: https://git.tld-linux.org/?p=packages%2Fgrub2.git;a=blobdiff_plain;f=tld-sysconfdir.patch;fp=tld-sysconfdir.patch;h=5334ccaddf16d5f3bb725fd3676bb00e4e1d19c8;hp=f5f08096fe6fb00c4f0cb377dacb8737e6c1aae7;hb=37c1d015a25095060b7e8e27365fa2767a402366;hpb=f95a1ca1ec8ddd7b01b033fd552bc7619faed11e

diff --git a/tld-sysconfdir.patch b/tld-sysconfdir.patch
index f5f0809..5334cca 100644
--- a/tld-sysconfdir.patch
+++ b/tld-sysconfdir.patch
@@ -1,17 +1,17 @@
-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
+diff -ur grub-2.04.orig/util/grub.d/README grub-2.04/util/grub.d/README
+--- grub-2.04.orig/util/grub.d/README	2018-11-24 18:13:02.000000000 +0100
++++ grub-2.04/util/grub.d/README	2019-08-18 15:41:16.068000000 +0200
+@@ -8,4 +8,4 @@
  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 -ur grub-2.04.orig/util/grub-mkconfig.in grub-2.04/util/grub-mkconfig.in
+--- grub-2.04.orig/util/grub-mkconfig.in	2019-05-20 12:59:36.000000000 +0200
++++ grub-2.04/util/grub-mkconfig.in	2019-08-18 15:41:16.068000000 +0200
+@@ -154,8 +154,8 @@
+ 	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
@@ -21,7 +21,7 @@ diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkco
  fi
  
  # XXX: should this be deprecated at some point?
-@@ -243,7 +243,7 @@ cat << EOF
+@@ -254,7 +254,7 @@
  # DO NOT EDIT THIS FILE
  #
  # It is automatically generated by $self using templates
@@ -30,7 +30,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
+@@ -280,7 +280,7 @@
    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.