Author: glen Date: Wed Nov 11 16:55:59 2009 GMT Module: packages Tag: HEAD ---- Log message: - add sysconfig/grub
---- Files affected: packages/grub2: grub2.spec (1.54 -> 1.55) , grub.sysconfig (NONE -> 1.1) (NEW), pld-sysconfdir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/grub2/grub2.spec diff -u packages/grub2/grub2.spec:1.54 packages/grub2/grub2.spec:1.55 --- packages/grub2/grub2.spec:1.54 Wed Nov 11 17:25:56 2009 +++ packages/grub2/grub2.spec Wed Nov 11 17:55:54 2009 @@ -21,9 +21,11 @@ # Source0-md5: 66fe18cd9318e3d67a34d7b7a8e7b1f6 Source1: update-grub Source2: update-grub.8 +Source3: grub.sysconfig URL: http://www.gnu.org/software/grub/grub-2.en.html BuildRequires: autoconf >= 2.53 Patch0: pld-initrd.patch +Patch1: pld-sysconfdir.patch BuildRequires: automake BuildRequires: bison BuildRequires: gawk @@ -104,6 +106,7 @@ %prep %setup -q -n grub-%{version} %patch0 -p1 +%patch1 -p1 %build cp -f /usr/share/automake/config.sub . @@ -134,14 +137,16 @@ %install rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT/etc/sysconfig %{__make} install \ - DESTDIR=$RPM_BUILD_ROOT \ - pkgdatadir="%{_datadir}" + pkgdatadir=%{_datadir} \ + DESTDIR=$RPM_BUILD_ROOT cp -a docs/grub.cfg $RPM_BUILD_ROOT%{_datadir} 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 rm $RPM_BUILD_ROOT%{_infodir}/dir %clean @@ -193,6 +198,7 @@ %{_datadir}/powerpc-* %endif %attr(755,root,root) %{_legcdir}/*_lib +%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/grub %dir %{_confdir} %attr(755,root,root) %{_confdir}/00_header %attr(755,root,root) %{_confdir}/10_linux @@ -215,6 +221,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.55 2009/11/11 16:55:54 glen +- add sysconfig/grub + Revision 1.54 2009/11/11 16:25:56 glen - add upgrade-grub from debian ================================================================ Index: packages/grub2/grub.sysconfig diff -u /dev/null packages/grub2/grub.sysconfig:1.1 --- /dev/null Wed Nov 11 17:55:59 2009 +++ packages/grub2/grub.sysconfig Wed Nov 11 17:55:54 2009 @@ -0,0 +1,22 @@ +# If you change this file, run 'update-grub' afterwards to update +# /boot/grub/grub.cfg. + +GRUB_DEFAULT=0 +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo PLD Linux` +GRUB_CMDLINE_LINUX_DEFAULT="quiet" +GRUB_CMDLINE_LINUX="" + +# Uncomment to disable graphical terminal (grub-pc only) +#GRUB_TERMINAL=console + +# The resolution used on graphical terminal +# note that you can use only modes which your graphic card supports via VBE +# you can see them in real GRUB with the command `vbeinfo' +#GRUB_GFXMODE=640x480 + +# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +#GRUB_DISABLE_LINUX_RECOVERY="true" ================================================================ Index: packages/grub2/pld-sysconfdir.patch diff -u /dev/null packages/grub2/pld-sysconfdir.patch:1.1 --- /dev/null Wed Nov 11 17:55:59 2009 +++ packages/grub2/pld-sysconfdir.patch Wed Nov 11 17:55:54 2009 @@ -0,0 +1,22 @@ +--- grub-1.97.1/util/grub-mkconfig.in~ 2009-11-09 17:48:16.000000000 +0200 ++++ grub-1.97.1/util/grub-mkconfig.in 2009-11-11 18:34:43.197334162 +0200 +@@ -130,8 +130,8 @@ + # choosing Hurd filesystem module. + GRUB_FS="`${grub_probe} --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? +@@ -242,7 +242,7 @@ + # DO NOT EDIT THIS FILE + # + # It is automatically generated by $0 using templates +-# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub ++# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/sysconfig/grub + # + EOF + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.54&r2=1.55&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
