diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-29 15:55:43 +0200 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-29 15:55:43 +0200 |
commit | f9ff8559427ede92e748c303b6bb16fea139e076 (patch) | |
tree | a7c079d6a1fba96649872ab9dbb0049179defe93 | |
parent | [net-dns/opendnssec] Initial ebuild (still lacks pkc creation and init scripts). (diff) | |
download | scarabeus-f9ff8559427ede92e748c303b6bb16fea139e076.tar.gz scarabeus-f9ff8559427ede92e748c303b6bb16fea139e076.tar.bz2 scarabeus-f9ff8559427ede92e748c303b6bb16fea139e076.zip |
[sys-boot/grub] Rework the default file for the grub.
-rw-r--r-- | sys-boot/grub/Manifest | 6 | ||||
-rw-r--r-- | sys-boot/grub/files/defaults | 30 | ||||
-rw-r--r-- | sys-boot/grub/files/grub.default | 36 | ||||
-rw-r--r-- | sys-boot/grub/grub-1.99.ebuild | 2 | ||||
-rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 2 |
5 files changed, 41 insertions, 35 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 262c3ba..e99e876 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,5 +1,5 @@ -AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f +AUX grub.default 1127 RMD160 a884e842cb203687cac4cac6551b0feed58d3b7a SHA1 5878147845b5d4b4aac34ce046ead60b93c3170c SHA256 32664f2e0bdd05cf9579f8e098aa0add76ef7bf7b37eb103c6d0f625204f44d3 DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b -EBUILD grub-1.99.ebuild 4011 RMD160 bf1b976b71d7165cb7092ee2a0c469cf8d72bb65 SHA1 daaaf4fa3b6f89651ee73ae4a830253e6956da80 SHA256 dfa4715c7ebcb41238a19fb0e7c9ecabb95e3baf4ea4d55ecd5caf221e98f3b3 -EBUILD grub-9999.ebuild 4011 RMD160 bf1b976b71d7165cb7092ee2a0c469cf8d72bb65 SHA1 daaaf4fa3b6f89651ee73ae4a830253e6956da80 SHA256 dfa4715c7ebcb41238a19fb0e7c9ecabb95e3baf4ea4d55ecd5caf221e98f3b3 +EBUILD grub-1.99.ebuild 4015 RMD160 35212619b0ec881a665bcd481062e7e640071cfe SHA1 bdff1287700e0da8a16f7d079dd04ed9c75e96e5 SHA256 8a312c21f31e6dda4c80fd52b3178b28a9284c186015f430483779637088d922 +EBUILD grub-9999.ebuild 4015 RMD160 35212619b0ec881a665bcd481062e7e640071cfe SHA1 bdff1287700e0da8a16f7d079dd04ed9c75e96e5 SHA256 8a312c21f31e6dda4c80fd52b3178b28a9284c186015f430483779637088d922 MISC metadata.xml 264 RMD160 3cb995676f964b9637fbfc0027a81b9409802608 SHA1 c4d35e3a71c545cdf1aae525de803126bf54f596 SHA256 9bd1ce830cf1b821978ab90c81b2e369177a8d7c1bfe2dd2868419872c097f64 diff --git a/sys-boot/grub/files/defaults b/sys-boot/grub/files/defaults deleted file mode 100644 index 25e5909..0000000 --- a/sys-boot/grub/files/defaults +++ /dev/null @@ -1,30 +0,0 @@ -# /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/files/grub.default b/sys-boot/grub/files/grub.default new file mode 100644 index 0000000..78f96ac --- /dev/null +++ b/sys-boot/grub/files/grub.default @@ -0,0 +1,36 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ +# +# To populate all changes in this file you need to regenerate your +# grub configuration file afterwards: +# 'grub-mkconfig -o /boot/grub/grub.cfg' +# +# See the grub info page for documentation on possible variables and +# their associated values. + +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 + +# Background image used on graphical terminal. +# Can be in various bitmap formats. +#GRUB_BACKGROUND="/boot/grub/mybackground.png" + +# 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-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild index 6aecfdf..a00a605 100644 --- a/sys-boot/grub/grub-1.99.ebuild +++ b/sys-boot/grub/grub-1.99.ebuild @@ -94,7 +94,7 @@ src_install() { default insinto /etc/default - newins "${FILESDIR}"/defaults grub + newins "${FILESDIR}"/grub.default grub cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib GRUB_DISTRIBUTOR="Gentoo" EOF diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 6aecfdf..a00a605 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -94,7 +94,7 @@ src_install() { default insinto /etc/default - newins "${FILESDIR}"/defaults grub + newins "${FILESDIR}"/grub.default grub cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib GRUB_DISTRIBUTOR="Gentoo" EOF |