diff options
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 11 | ||||
| -rw-r--r-- | sys-boot/grub/files/defaults | 30 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 6 |
4 files changed, 46 insertions, 7 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/Manifest b/sys-boot/grub/Manifest index ba3cfec74b93..ec57d49e811f 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389 AUX grub-1.96-genkernel.patch 634 RMD160 bc1fdaa51e3f0e3b777a303e0f1c76987c7e69e5 SHA1 e79384a3ac32bfd74c884ead8133b1691a743316 SHA256 8ee327465d9b6d704a78b0c7b31cfdee7c6e7e9f9897e8d0a86198430f0c6ea0 AUX grub-1.99-genkernel.patch 745 RMD160 02675a7c654b46b9047a432004cfd8d6d1b74649 SHA1 3d0e32b99e716e85a17d28db8d29679c30af8a11 SHA256 19e266d18b2e7ec41a39be06a12f4a2a647155590a30ed4c79e5caf6a60a4343 @@ -40,13 +41,13 @@ EBUILD grub-0.97-r9.ebuild 9077 RMD160 dd85bded8ff1f243949873e56aeca30aef51f194 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a EBUILD grub-1.98.ebuild 3071 RMD160 1e510ef137ec6e36b60776f0d6c3443c750791c4 SHA1 62f94b453eb1d6f34a7133f329a906191784a5a1 SHA256 e074df6faced168f75dcc966b72c13e0524a3e41e80c1939d6ee4cbaa3f9e926 EBUILD grub-1.99_rc1.ebuild 3200 RMD160 8034f96bc2e554abb0ebbae7b1258b244a84112d SHA1 c61c079e406f7d01f341175a23cef4467d4f03e9 SHA256 5f983c92c69cae4b0f7a3d16f1758952902972040a25640d4c9cc9674bbab2a3 -EBUILD grub-9999.ebuild 3096 RMD160 85368f2d0a0948f71fa667029281f604159b746a SHA1 dce0bebb1f4928ab3389c757784c7338eba5c95b SHA256 ea85ee51967f5843df34c59c820d4c7be08dbb72f8aa908cc4fb8a820b3de8aa -MISC ChangeLog 30940 RMD160 f747b17cb23e2e635fe3a668222320a62886f169 SHA1 1e71d9666ed9f1f9cf80014ee804ccc605a34c22 SHA256 af1b5101f1db6b3e6056ed6324849108c8275994d7d8ccecc42d6e8ba3486f73 +EBUILD grub-9999.ebuild 3158 RMD160 f0aed5a279153aa111a50eb310203c5f68baae0e SHA1 4fc3cecd5cf204df3bfc2d7639223758187a865c SHA256 623d84d5ed356c3a0fb8f0942ac47546816097b050cd932b8ae86c7fb3663a97 +MISC ChangeLog 31083 RMD160 75df95724782c6add0cc1e925a5559dcc3fcdc14 SHA1 ec77e790149a25263a15ec9ec7d1b86805d39558 SHA256 9b3a14ba3f2b4c665b7afb4e8f9a12fb6bf62bd028409ffe50dbb5c7a939d4e2 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk2Ysc4ACgkQaC/OocHi7JYu9QD/fQf4dGw/UA8hIjaQlCuIh/d4 -OJMfAJXC69Zdm7qNkfsA/RItIuzTvRG7LPHfXt8JWsJ2GVehhG/+5czzcZR4CtxV -=CP5p +iF4EAREIAAYFAk2Yt/YACgkQaC/OocHi7JbV8AD+NMqMgQ4TFi1hLYtx1kskYsjp +hu4G4uHY6Weg/WGbX4oA/1Jf9fzOa7gDoaiiMJ2PERd0DjeAZHhh0NhrNtfTFihg +=zkX7 -----END PGP SIGNATURE----- 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 |