up to 2.12

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

diff --git a/pld-sysconfdir.patch b/pld-sysconfdir.patch
index f53f128fb471fa30bb62dacead87b8f8b34d28e3..a02176fea4ad6e1db04b8816687c977025fac6f5 100644 (file)
--- a/pld-sysconfdir.patch
+++ b/pld-sysconfdir.patch
@@ -2,8 +2,8 @@ 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`"
+       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,7 +11,7 @@ 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?
+ if [ "x${GRUB_DISABLE_UUID}" = "xtrue" ]; then
 @@ -232,7 +232,7 @@
  # DO NOT EDIT THIS FILE
  #
@@ -29,7 +29,7 @@ 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
+     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