- updated for 2.02-beta3

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

diff --git a/tld-sysconfdir.patch b/tld-sysconfdir.patch
index f53f128fb471fa30bb62dacead87b8f8b34d28e3..36a08553bcc7adf5c23c95f126afabf034a4f2bc 100644 (file)
--- a/tld-sysconfdir.patch
+++ b/tld-sysconfdir.patch
@@ -1,9 +1,18 @@
-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 -ur grub-2.02-beta3.orig/util/grub.d/README grub-2.02-beta3/util/grub.d/README
+--- grub-2.02-beta3.orig/util/grub.d/README    2016-02-28 02:07:41.000000000 +0000
++++ grub-2.02-beta3/util/grub.d/README 2016-03-21 07:42:22.370768000 +0000
+@@ -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 -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mkconfig.in
+--- grub-2.02-beta3.orig/util/grub-mkconfig.in 2016-02-28 02:07:41.000000000 +0000
++++ grub-2.02-beta3/util/grub-mkconfig.in      2016-03-21 07:42:22.369768000 +0000
+@@ -147,8 +147,8 @@
+     GRUB_FS="$(stat -f --printf=%T / || echo unknown)"
+ fi
  
 -if test -f ${sysconfdir}/default/grub ; then
 -  . ${sysconfdir}/default/grub
@@ -12,7 +21,7 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
  fi
  
  # XXX: should this be deprecated at some point?
-@@ -232,7 +232,7 @@
+@@ -243,7 +243,7 @@
  # DO NOT EDIT THIS FILE
  #
  # It is automatically generated by $self using templates
@@ -21,7 +30,7 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in
  #
  EOF
  
-@@ -257,7 +257,7 @@
+@@ -269,7 +269,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.
@@ -29,13 +38,4 @@ 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 @@
- 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.
+     echo >&2