- move probe scripts to /lib/grub.d, /etc/grub.d now contains true configs; rel 7

Changed files:
    grub2.spec -> 1.72
    pld-mkconfigdir.patch -> 1.1

diff --git a/grub2.spec b/grub2.spec
index 410abbf3faebc0e0d55ad7c84bb77f5eaeac0ab5..bf4fb21a612bd81997625cb8fdf794426a9d9bb1 100644 (file)
--- a/grub2.spec
+++ b/grub2.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):      GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR.UTF-8):  Gerenciador de inicialização GRUB2
 Name:          grub2
 Version:       1.97.1
-Release:       6
+Release:       7
 License:       GPL v2
 Group:         Base
 Source0:       http://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz
@@ -17,6 +17,7 @@ Source0:      http://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz
 Source1:       update-grub
 Source2:       update-grub.8
 Source3:       grub.sysconfig
+Source4:       grub-custom.cfg
 URL:           http://www.gnu.org/software/grub/grub-2.en.html
 BuildRequires: autoconf >= 2.53
 Patch0:                pld-initrd.patch
@@ -25,6 +26,7 @@ Patch2:               grub-garbage.patch
 Patch3:                grub-shelllib.patch
 Patch4:                grub-install.in.patch
 Patch5:                grub-lvmdevice.patch
+Patch6:                pld-mkconfigdir.patch
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: gawk
@@ -139,6 +141,7 @@ avançados e que querem mais recursos de seu boot loader.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -170,7 +173,7 @@ AWK=gawk \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/sysconfig
+install -d $RPM_BUILD_ROOT{/etc/sysconfig,%{_sysconfdir}/grub.d}
 
 %{__make} install \
        pkgdatadir=%{_libexecdir} \
@@ -181,7 +184,9 @@ cp -a docs/grub.cfg $RPM_BUILD_ROOT%{_libexecdir}
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sbindir}/update-grub
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8/update-grub.8
 cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/grub
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/custom.cfg
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 # deprecated. we don't need it
 rm $RPM_BUILD_ROOT/lib/update-grub_lib
 
@@ -256,12 +261,15 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %{_libexecdir}/device.map
 %ghost %{_libexecdir}/core.img
 
-%dir %{_sysconfdir}/grub.d
-%doc %{_sysconfdir}/grub.d/README
-%attr(755,root,root) %{_sysconfdir}/grub.d/00_header
-%attr(755,root,root) %{_sysconfdir}/grub.d/10_linux
-%attr(755,root,root) %{_sysconfdir}/grub.d/30_os-prober
-%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/grub.d/40_custom
+%dir /lib/grub.d
+%doc /lib/grub.d/README
+%attr(755,root,root) /lib/grub.d/00_header
+%attr(755,root,root) /lib/grub.d/10_linux
+%attr(755,root,root) /lib/grub.d/30_os-prober
+%attr(755,root,root) /lib/grub.d/40_custom
+
+%dir %attr(750,root,root) /etc/grub.d
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/grub.d/custom.cfg
 
 %ifarch %{ix86} %{x8664}
 %attr(755,root,root) %{_sbindir}/grub-mkdevicemap

diff --git a/pld-mkconfigdir.patch b/pld-mkconfigdir.patch
new file mode 100644 (file)
index 0000000..8995d49
--- /dev/null
+++ b/pld-mkconfigdir.patch
@@ -0,0 +1,51 @@
+--- grub-1.97.1/util/grub-mkconfig.in~ 2010-01-12 12:14:40.000000000 +0200
++++ grub-1.97.1/util/grub-mkconfig.in  2010-01-12 12:26:24.581982969 +0200
+@@ -29,7 +29,7 @@
+ pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"`
+ grub_prefix=`echo /boot/grub | sed ${transform}`
+ grub_cfg=""
+-grub_mkconfig_dir=${sysconfdir}/grub.d
++grub_mkconfig_dir=/lib/grub.d
+ 
+ grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
+ grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
+--- grub-1.97.1/Makefile.in~   2010-01-12 12:14:39.000000000 +0200
++++ grub-1.97.1/Makefile.in    2010-01-12 12:27:38.395326461 +0200
+@@ -282,16 +282,16 @@
+         $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \
+         $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \
+       done
+-      $(SHELL) $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d
++      $(SHELL) $(mkinstalldirs) $(DESTDIR)/lib/grub.d
+       @list='$(grub-mkconfig_SCRIPTS)'; for file in $$list; do \
+         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
+         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
+-        $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
++        $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)/lib/grub.d/$$dest; \
+       done
+       @list='$(grub-mkconfig_DATA)'; for file in $$list; do \
+         if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
+         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
+-        $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
++        $(INSTALL_DATA) $$dir$$file $(DESTDIR)/lib/grub.d/$$dest; \
+       done
+       $(SHELL) $(mkinstalldirs) $(DESTDIR)/lib
+       @list='$(lib_SCRIPTS)'; \
+@@ -338,7 +338,7 @@
+       done
+       @list='$(grub-mkconfig_SCRIPTS) $(grub-mkconfig_DATA)'; for file in $$list; do \
+         dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
+-        rm -f $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
++        rm -f $(DESTDIR)/lib/grub.d/$$dest; \
+       done
+       @list='$(lib_SCRIPTS)'; \
+       for file in $$list; do \
+--- grub-1.97.1/util/grub.d/40_custom.in~      2009-11-09 17:48:16.000000000 +0200
++++ grub-1.97.1/util/grub.d/40_custom.in       2010-01-12 12:37:52.608575356 +0200
+@@ -1,5 +1,2 @@
+ #!/bin/sh
+-exec tail -n +3 $0
+-# This file provides an easy way to add custom menu entries.  Simply type the
+-# menu entries you want to add after this comment.  Be careful not to change
+-# the 'exec tail' line above.
++cat /etc/grub.d/custom.cfg