projects / packages / grub2.git / blame
| Commit | Line | Data |
|---|---|---|
| e2964b87 ER |
1 | --- grub-1.97.1/util/grub-mkconfig.in~ 2010-01-12 12:14:40.000000000 +0200 |
| 2 | +++ grub-1.97.1/util/grub-mkconfig.in 2010-01-12 12:26:24.581982969 +0200 | |
| 3 | @@ -29,7 +29,7 @@ | |
| 4 | pkgdatadir=${datadir}/`echo @PACKAGE_TARNAME@ | sed "${transform}"` | |
| 5 | grub_prefix=`echo /boot/grub | sed ${transform}` | |
| 6 | grub_cfg="" | |
| 7 | -grub_mkconfig_dir=${sysconfdir}/grub.d | |
| 8 | +grub_mkconfig_dir=/lib/grub.d | |
| 9 | ||
| 10 | grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` | |
| 11 | grub_probe=${sbindir}/`echo grub-probe | sed ${transform}` | |
| 12 | --- grub-1.97.1/Makefile.in~ 2010-01-12 12:14:39.000000000 +0200 | |
| 13 | +++ grub-1.97.1/Makefile.in 2010-01-12 12:27:38.395326461 +0200 | |
| 14 | @@ -282,16 +282,16 @@ | |
| 15 | $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sbindir)/$$dest; \ | |
| 16 | $(HELP2MAN) --section=8 -o $(DESTDIR)$(mandir)/man8/$$dest.8 $(builddir)/$$file; \ | |
| 17 | done | |
| 18 | - $(SHELL) $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/grub.d | |
| 19 | + $(SHELL) $(mkinstalldirs) $(DESTDIR)/lib/grub.d | |
| 20 | @list='$(grub-mkconfig_SCRIPTS)'; for file in $$list; do \ | |
| 21 | if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ | |
| 22 | dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ | |
| 23 | - $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \ | |
| 24 | + $(INSTALL_SCRIPT) $$dir$$file $(DESTDIR)/lib/grub.d/$$dest; \ | |
| 25 | done | |
| 26 | @list='$(grub-mkconfig_DATA)'; for file in $$list; do \ | |
| 27 | if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ | |
| 28 | dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ | |
| 29 | - $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \ | |
| 30 | + $(INSTALL_DATA) $$dir$$file $(DESTDIR)/lib/grub.d/$$dest; \ | |
| 31 | done | |
| 32 | $(SHELL) $(mkinstalldirs) $(DESTDIR)/lib | |
| 33 | @list='$(lib_SCRIPTS)'; \ | |
| 34 | @@ -338,7 +338,7 @@ | |
| 35 | done | |
| 36 | @list='$(grub-mkconfig_SCRIPTS) $(grub-mkconfig_DATA)'; for file in $$list; do \ | |
| 37 | dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \ | |
| 38 | - rm -f $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \ | |
| 39 | + rm -f $(DESTDIR)/lib/grub.d/$$dest; \ | |
| 40 | done | |
| 41 | @list='$(lib_SCRIPTS)'; \ | |
| 42 | for file in $$list; do \ | |
| 43 | --- grub-1.97.1/util/grub.d/40_custom.in~ 2009-11-09 17:48:16.000000000 +0200 | |
| 44 | +++ grub-1.97.1/util/grub.d/40_custom.in 2010-01-12 12:37:52.608575356 +0200 | |
| 45 | @@ -1,5 +1,2 @@ | |
| 46 | #!/bin/sh | |
| 47 | -exec tail -n +3 $0 | |
| 48 | -# This file provides an easy way to add custom menu entries. Simply type the | |
| 49 | -# menu entries you want to add after this comment. Be careful not to change | |
| 50 | -# the 'exec tail' line above. | |
| 51 | +cat /etc/grub.d/custom.cfg |