X-Git-Url: https://git.tld-linux.org/?p=packages%2Fgrub2.git;a=blobdiff_plain;f=tld-sysconfdir.patch;fp=tld-sysconfdir.patch;h=f53f128fb471fa30bb62dacead87b8f8b34d28e3;hp=0000000000000000000000000000000000000000;hb=0c7e9e937b0b31aa78da86bd80f3957eafc8092d;hpb=9d17de0887ee48f66be4e47be43f8fc6a4ea7799

diff --git a/tld-sysconfdir.patch b/tld-sysconfdir.patch
new file mode 100644
index 0000000..f53f128
--- /dev/null
+++ b/tld-sysconfdir.patch
@@ -0,0 +1,41 @@
+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`"
+ 
+-if test -f ${sysconfdir}/default/grub ; then
+-  . ${sysconfdir}/default/grub
++if test -f ${sysconfdir}/sysconfig/grub ; then
++  . ${sysconfdir}/sysconfig/grub
+ fi
+ 
+ # XXX: should this be deprecated at some point?
+@@ -232,7 +232,7 @@
+ # DO NOT EDIT THIS FILE
+ #
+ # It is automatically generated by $self using templates
+-# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
++# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/sysconfig/grub
+ #
+ EOF
+ 
+@@ -257,7 +257,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.
+-Ensure that there are no errors in /etc/default/grub
++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.