summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-11-27 00:35:21 +0000
committerMike Frysinger <vapier@gentoo.org>2006-11-27 00:35:21 +0000
commit29cce44d2d49034c579feb9f9ca25d8a99b1e8a0 (patch)
treebb78a5b0b22ed8b09d56fab1c828684e30cf3934 /sys-boot
parentuse "latest" with autotools (diff)
downloadhistorical-29cce44d2d49034c579feb9f9ca25d8a99b1e8a0.tar.gz
historical-29cce44d2d49034c579feb9f9ca25d8a99b1e8a0.tar.bz2
historical-29cce44d2d49034c579feb9f9ca25d8a99b1e8a0.zip
backport quoting fix #156214
Package-Manager: portage-2.1.2_rc2-r2
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/Manifest22
-rw-r--r--sys-boot/grub/grub-0.97-r2.ebuild11
2 files changed, 16 insertions, 17 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index b5d90aff6301..456e7628f91c 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -35,14 +35,14 @@ EBUILD grub-0.96-r3.ebuild 4577 RMD160 4a1ac26fd3cce98617883b620255761b98cc8deb
MD5 80623fad414fd78bb04b0479b94d76df grub-0.96-r3.ebuild 4577
RMD160 4a1ac26fd3cce98617883b620255761b98cc8deb grub-0.96-r3.ebuild 4577
SHA256 bbd95b515988ee477725067b1778d0c39665bdce66e61f2e7a9e374a425ac53c grub-0.96-r3.ebuild 4577
-EBUILD grub-0.97-r2.ebuild 4837 RMD160 3be1f8c5d07869ba526c90dd12976acc3247ded9 SHA1 ffa6d63e3ac4c6b87115a29e68bce5e5c471b33d SHA256 6eb3c9306e3e14a0165d96682e28e992851b169df3635a638381d351520f8d01
-MD5 fd24450c500bd873efa1d7b8192ad7e6 grub-0.97-r2.ebuild 4837
-RMD160 3be1f8c5d07869ba526c90dd12976acc3247ded9 grub-0.97-r2.ebuild 4837
-SHA256 6eb3c9306e3e14a0165d96682e28e992851b169df3635a638381d351520f8d01 grub-0.97-r2.ebuild 4837
-EBUILD grub-0.97-r3.ebuild 4663 RMD160 addda50d4f079f60f2105b8247a4e9a62b38aaf2 SHA1 d9ac5e43477ac86b5ff680562b4e6258157fb84d SHA256 dcef1775246493af737b84b84860ebf3f86833883036c83549bc0fe3cfcd60c6
-MD5 1784b5d43c6f7a8caf7da231e8827c5f grub-0.97-r3.ebuild 4663
-RMD160 addda50d4f079f60f2105b8247a4e9a62b38aaf2 grub-0.97-r3.ebuild 4663
-SHA256 dcef1775246493af737b84b84860ebf3f86833883036c83549bc0fe3cfcd60c6 grub-0.97-r3.ebuild 4663
+EBUILD grub-0.97-r2.ebuild 4837 RMD160 857c138748179eac8113fb04166b07d409ed5eca SHA1 41effb9a073d97587d1ffc5cc4ad3c8fcf9b6fab SHA256 433ac8c39e9c9d31e8f470a487d473d4a308520918bdd7763f9ca5b836be6bc0
+MD5 b270740a856aa2612f5f28a2afc4fad4 grub-0.97-r2.ebuild 4837
+RMD160 857c138748179eac8113fb04166b07d409ed5eca grub-0.97-r2.ebuild 4837
+SHA256 433ac8c39e9c9d31e8f470a487d473d4a308520918bdd7763f9ca5b836be6bc0 grub-0.97-r2.ebuild 4837
+EBUILD grub-0.97-r3.ebuild 4669 RMD160 b00799e1dd9dde4c0da70f36e5fbf472da22017d SHA1 240e4829202c2e4eaada1a4535882a24d89b99b8 SHA256 1f2bf846f123ae549fe1a7fff8037a8d8ffd1a02aed5613dcef085e974493a2c
+MD5 29ec4b428b9d7bd623d5eb6f4ee856c8 grub-0.97-r3.ebuild 4669
+RMD160 b00799e1dd9dde4c0da70f36e5fbf472da22017d grub-0.97-r3.ebuild 4669
+SHA256 1f2bf846f123ae549fe1a7fff8037a8d8ffd1a02aed5613dcef085e974493a2c grub-0.97-r3.ebuild 4669
EBUILD grub-0.97.ebuild 4518 RMD160 d03dba427b2b040e2b741776a849c4f030793af2 SHA1 07484f2e49a04c267a8f3dec6118b4a2833dbdcd SHA256 7e8e3cd6a5e43507955850ae5d33aaecfb853d8573e54aca5b75b63de7bf48e6
MD5 98aac6dc17a7d909ca1de859ef1394a2 grub-0.97.ebuild 4518
RMD160 d03dba427b2b040e2b741776a849c4f030793af2 grub-0.97.ebuild 4518
@@ -89,7 +89,7 @@ SHA256 fe0d1d73c9724dd4653eb68231878133e6d00f1e33bb3f38dc73c249efa02631 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
-iD8DBQFFOqN7amhnQswr0vIRAojaAJ9iJAeZZ01Qqb/TjG2d3LA+65Y3zwCfef8f
-oRJnfHfQYt/P+nUdH4FQOw4=
-=3YWZ
+iD8DBQFFajMeamhnQswr0vIRAs3gAJ0ft1TBEI1zLh5ETojObejFn7w3MwCguYIq
+/ayOy/Z2kB/tLum7pdCdwoY=
+=cUg0
-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r2.ebuild b/sys-boot/grub/grub-0.97-r2.ebuild
index 16812e7fff20..5dd50bbd89e1 100644
--- a/sys-boot/grub/grub-0.97-r2.ebuild
+++ b/sys-boot/grub/grub-0.97-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.9 2006/09/21 14:28:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.10 2006/11/27 00:35:21 vapier Exp $
inherit mount-boot eutils flag-o-matic toolchain-funcs
@@ -123,13 +123,12 @@ 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
- mv -f "${dir}/grub/menu.lst ${dir}/grub/grub.conf"
+ 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