up to 2.12

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

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 @@
 	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
+if test -f ${sysconfdir}/sysconfig/grub ; then
+  . ${sysconfdir}/sysconfig/grub
 fi
 
 if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
@@ -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
     echo >&2
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.