diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-04-03 18:10:01 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-04-03 18:10:01 +0000 |
| commit | acf6e5946daf5d32b26d5c794e6c02786b2effa4 (patch) | |
| tree | 842fd98a363f0a67d2dd0e652c6966ee3879880f /sys-boot/grub | |
| parent | Use proper if-logic in autofs.initd, bug #361787, thank Piotr Mitas for repor... (diff) | |
| download | gentoo-2-acf6e5946daf5d32b26d5c794e6c02786b2effa4.tar.gz gentoo-2-acf6e5946daf5d32b26d5c794e6c02786b2effa4.tar.bz2 gentoo-2-acf6e5946daf5d32b26d5c794e6c02786b2effa4.zip | |
Start an example /etc/defaults/grub #359365 by john.
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot/grub')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/files/defaults | 30 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 6 |
3 files changed, 40 insertions, 2 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 1b739a2e4979..cc75496b18f6 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.151 2011/04/03 17:43:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.152 2011/04/03 18:10:01 vapier Exp $ + + 03 Apr 2011; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild, + +files/defaults: + Start an example /etc/defaults/grub #359365 by john. 03 Apr 2011; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild: Drop genkernel patch now that upstream has integrated it. diff --git a/sys-boot/grub/files/defaults b/sys-boot/grub/files/defaults new file mode 100644 index 000000000000..25e59090071f --- /dev/null +++ b/sys-boot/grub/files/defaults @@ -0,0 +1,30 @@ +# /etc/defaults/grub +# If you change this file, run 'grub-mkconfig -o /boot/grub/grub.cfg' +# afterwords to update /boot/grub/grub.cfg. Make sure your /boot is +# mounted rw before executing this command. +# +# See the grub info page for documentation on possible variables and +# their associated values. This wiki also has random bits of info: +# http://en.gentoo-wiki.com/wiki/Grub2#Using_variables + +GRUB_DEFAULT=0 +GRUB_HIDDEN_TIMEOUT=0 +GRUB_HIDDEN_TIMEOUT_QUIET=true +GRUB_TIMEOUT=10 + +GRUB_CMDLINE_LINUX_DEFAULT="" +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 entrys +#GRUB_DISABLE_RECOVERY=true diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 9783332f99c8..3091fd126783 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.30 2011/04/03 17:43:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.31 2011/04/03 18:10:01 vapier Exp $ # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch @@ -73,9 +73,13 @@ src_compile() { src_install() { emake DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog NEWS README THANKS TODO + + insinto /etc/defaults + doins "${FILESDIR}"/defaults || die cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib GRUB_DISTRIBUTOR="Gentoo" EOF + if use multislot ; then sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die mv "${D}"/sbin/grub{,2}-install || die |