From f144c5f6c0829614c68eb5c3e2bf0450ad3403a23abfcba8907198e01612e6af Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Mon, 25 Jun 2012 12:40:52 +0000
Subject: [PATCH] Accepting request 125780 from devel:openSUSE:Factory

Please help to review the patch. Thanks a lot. (forwarded request 125772 from michael-chang)

OBS-URL: https://build.opensuse.org/request/show/125780
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=36
---
 grub2.changes |  6 ++++++
 grub2.spec    | 12 ++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/grub2.changes b/grub2.changes
index fe7b1cf..4b312e4 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 22 08:50:12 UTC 2012 - mchang@suse.com
+
+- do not package grub.cfg, as it's generated at runtime and the
+  presence of it would confuse pygrub (bnc#768063)
+
 -------------------------------------------------------------------
 Wed May 16 06:38:05 UTC 2012 - mchang@suse.com
 
diff --git a/grub2.spec b/grub2.spec
index 933b528..aaa79bb 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -215,7 +215,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # Ghost config file
 install -d $RPM_BUILD_ROOT/boot/%{name}-efi
 touch $RPM_BUILD_ROOT/boot/%{name}-efi/grub.cfg
-ln -s ../boot/%{name}-efi/grub.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg
 
 install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/opensuse/
 install -m 755 grub.efi $RPM_BUILD_ROOT/boot/efi/EFI/opensuse/grub.efi
@@ -236,7 +235,6 @@ install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/
 # Ghost config file
 install -d $RPM_BUILD_ROOT/boot/%{name}
 touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg
-ln -s ../boot/%{name}/grub.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.cfg
 
 # Remove devel files
 rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*/*.h
@@ -320,11 +318,8 @@ fi
 %dir %{_sysconfdir}/grub.d
 %{_sysconfdir}/grub.d/README
 %config %{_sysconfdir}/grub.d/??_*
-%{_sysconfdir}/%{name}.cfg
 %dir /boot/%{name}
-# Actually, this is replaced by update-grub from scriptlets,
-# but it takes care of modified persistent part
-%config(noreplace) /boot/%{name}/grub.cfg
+%ghost /boot/%{name}/grub.cfg
 %doc grub-%{version}/COPYING grub-%{version}/NEWS
 %doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO
 %doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE
@@ -366,11 +361,8 @@ fi
 %{_sbindir}/grub2-efi-ofpathname
 %endif
 %{_bindir}/grub2-efi-script-check
-%{_sysconfdir}/grub2-efi.cfg
 %dir /boot/grub2-efi
-# Actually, this is replaced by update-grub from scriptlets,
-# but it takes care of modified persistent part
-%config(noreplace) /boot/grub2-efi/grub.cfg
+%ghost /boot/grub2-efi/grub.cfg
 %doc grub-%{version}/COPYING grub-%{version}/NEWS
 %doc grub-%{version}/README grub-%{version}/THANKS grub-%{version}/TODO
 %doc grub-%{version}/ChangeLog grub-%{version}/README.openSUSE