diff options
| -rw-r--r-- | sys-boot/grub-static/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-boot/grub-static/Manifest | 14 | ||||
| -rw-r--r-- | sys-boot/grub-static/grub-static-0.97.ebuild | 25 |
3 files changed, 31 insertions, 16 deletions
diff --git a/sys-boot/grub-static/ChangeLog b/sys-boot/grub-static/ChangeLog index f2c7cf889ea2..f04de2f8f714 100644 --- a/sys-boot/grub-static/ChangeLog +++ b/sys-boot/grub-static/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub-static -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.13 2006/12/20 16:21:23 dsd Exp $ +# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.14 2008/02/25 22:13:20 wolf31o2 Exp $ + + 25 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> + grub-static-0.97.ebuild: + Sync with sys-boot/grub. 20 Dec 2006; Daniel Drake <dsd@gentoo.org> grub-static-0.97.ebuild: Stable on amd64, bug #156459 diff --git a/sys-boot/grub-static/Manifest b/sys-boot/grub-static/Manifest index 26573bca1204..8c6ce0aaceb1 100644 --- a/sys-boot/grub-static/Manifest +++ b/sys-boot/grub-static/Manifest @@ -1,6 +1,16 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST grub-static-0.96.tar.bz2 859179 RMD160 799759e6e4771527e5daf6dfbe7de647482229d4 SHA1 e334fe0429b215ce726b0c42c5ca12e13c858157 SHA256 3ece8910e7954ca2c2cbebc4d05cfb22e73455f826508661a5b1a60481dcbd76 DIST grub-static-0.97.tar.bz2 954051 RMD160 3b4d3951df5ab0255321631dd383803bb2302977 SHA1 aaddbe5f31788cd6e46a0e76219b76ae14ac062a SHA256 468ac48823880bd7cb2dd6bf60673adef1313c44a5e3131a0a4a37d2cc1145bc EBUILD grub-static-0.96-r1.ebuild 525 RMD160 1db51afc5990529daec430447c1a0f0a1d8bf9b7 SHA1 621aca72148f7a701bea3ced135961c2c29ce5bd SHA256 f7a3c6a239fed5b54b1ea246700576731b016f525e2204c5c2b196bc312780ef -EBUILD grub-static-0.97.ebuild 1973 RMD160 f2e9b16c8840b06eb7ed737deea83dd929939604 SHA1 43e9f5c7cac166265d50c1133c7f695876c8412c SHA256 c0746e6afb25e20ff5c24d9a8097dad68d8a838ee747e2602a3ea229952f2d0b -MISC ChangeLog 1918 RMD160 2392d51c57737714f835dcb18325b7d72fc7354d SHA1 a7d6d5171bdfe343eaba89b954930592fbac911e SHA256 65e8285787a8c436948025a287b73d5e8637913ea40a05b46c53559c87a18f55 +EBUILD grub-static-0.97.ebuild 2039 RMD160 4619b70df076072f36622476e35d47988bf884b3 SHA1 6dee6599dde71c33b2c1142b120e966f86e68fc9 SHA256 41704a8a311c69182ff2eabd23ab281324af5b6ad879906c9b2e3332273aaddf +MISC ChangeLog 2032 RMD160 f5cfeac069c8aa9510c075472ecb73c9a72f7ced SHA1 1bdfefec4ca7e79e3942f4b2128f7a1791b4dc3d SHA256 6cbf58a202161eead5769b214f2d24bcb19880d50e4d3472f54f0bc91c606184 MISC metadata.xml 158 RMD160 d823c6f24034325d607a095ce2851034d70fd2f2 SHA1 7e7b3c2aedeb5fa2761c27cf8f56b5240ae9678e SHA256 0df9eb61f6a4e4a3f8fc16386b0204e22e85940533d769d4a0418a4ecec50d90 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFHwz2CkT4lNIS36YERAsS8AKCj3qGPxo6JiN9aS6xWkoGEZT1oQgCfSYjv +8QGAgmMKXy6c9V90r9EBAQs= +=ZcWh +-----END PGP SIGNATURE----- diff --git a/sys-boot/grub-static/grub-static-0.97.ebuild b/sys-boot/grub-static/grub-static-0.97.ebuild index 6ee9b748a982..b21a07664b12 100644 --- a/sys-boot/grub-static/grub-static-0.97.ebuild +++ b/sys-boot/grub-static/grub-static-0.97.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97.ebuild,v 1.4 2006/12/20 16:21:23 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97.ebuild,v 1.5 2008/02/25 22:13:20 wolf31o2 Exp $ inherit mount-boot @@ -27,30 +27,30 @@ src_install() { setup_boot_dir() { local dir="${1}" - [[ ! -e ${dir} ]] && die "${dir} does not exist!" - [[ ! -e ${dir}/grub ]] && mkdir "${dir}/grub" + [[ ! -e "${dir}" ]] && die "${dir} does not exist!" + [[ ! -e "${dir}"/grub ]] && mkdir "${dir}/grub" # change menu.lst to grub.conf - if [[ ! -e ${dir}/grub/grub.conf ]] && [[ -e ${dir}/grub/menu.lst ]] ; then + if [[ ! -e "${dir}"/grub/grub.conf ]] && [[ -e "${dir}"/grub/menu.lst ]] ; then mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf ewarn ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf" ewarn fi - if [[ ! -e ${dir}/grub/menu.lst ]]; then + if [[ ! -e "${dir}"/grub/menu.lst ]]; then einfo "Linking from new grub.conf name to menu.lst" ln -snf grub.conf "${dir}"/grub/menu.lst fi - [[ -e ${dir}/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old} + [[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old} - einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}"" + einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}" for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do - [[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/ + [[ -f "${x}" ]] && cp -p "${x}" "${dir}"/grub/ done - if [[ -e ${dir}/grub/grub.conf ]] ; then + if [[ -e "${dir}"/grub/grub.conf ]] ; then egrep \ -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \ "${dir}"/grub/grub.conf | \ @@ -61,7 +61,8 @@ setup_boot_dir() { } pkg_postinst() { - [[ ${ROOT} != "/" ]] && return 0 + [[ "${ROOT}" != "/" ]] && return 0 + [[ -n ${DONT_MOUNT_BOOT} ]] && return 0 setup_boot_dir /boot einfo "To install grub files to another device (like a usb stick), just run:" einfo " emerge --config =${PF}" @@ -71,5 +72,5 @@ pkg_config() { local dir einfo "Enter the directory where you want to setup grub:" read dir - setup_boot_dir ${dir} + setup_boot_dir "${dir}" } |