Fix bug #260547 (drop the /etc/fstab -> GRUB translation code).

Package-Manager: portage-2.1.6.9/cvs/Linux x86_64

4 files changed, 23 insertions, 59 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index 989a3b5a45c1..d95d7e0d5f11 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/memtest86
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.34 2008/09/28 11:01:23 spock Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.35 2009/03/22 21:30:38 spock Exp $
+
+  22 Mar 2009; Michał Januszewski <spock@gentoo.org> memtest86-3.3.ebuild,
+  memtest86-3.4.ebuild:
+  Fix bug #260547 (drop the /etc/fstab -> GRUB translation code).
 
   28 Sep 2008; Michał Januszewski <spock@gentoo.org> Manifest:
   Compile memtest86+ with -O1 instead of -Os (bug #217324).
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest
index 5c302e2c8ad8..ce45d115e49f 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -8,14 +8,14 @@ AUX memtest86-3.3-gnu-hash.patch 297 RMD160 b11789b6e1882da3b29f661843e819f76aee
 AUX memtest86-3.4-build.patch 968 RMD160 59653c59b23d946191afb96cd831bc963fa4766b SHA1 918cda50a7433cadd95584ef54619bd0a2cf09eb SHA256 b222dfcbde08451974a95515bdd84762e4ec93e8226cfe42b019cf7d1e9db7eb
 DIST memtest86-3.3.tar.gz 137922 RMD160 dd390793b9e2601ceccc01671dc9aaf602a8590f SHA1 e4ae8c12e44a7f4bf7567e1601cff6b811819ee7 SHA256 f4580d15636b18885709c8aca06759a512911b2efa76d28de2389165dfb9548c
 DIST memtest86-3.4.tar.gz 201204 RMD160 8a4e2bddfd75e7d07a0448dc8b94dd29e67800d5 SHA1 3af9e20888401e9d0eb3eab4e793a48f0520c436 SHA256 5dd0f964c0edf887ecf462526f2f8dd1c2cccbd723390759b98e142a2394c134
-EBUILD memtest86-3.3.ebuild 1939 RMD160 441d7aef0f24a2e483a1b22d4c3c4545c6dd9e7f SHA1 89182614c368440c5fb747746a61c3e5f9da599f SHA256 f36c5e4d7e9e9a7d366f4f7d40cde3041a2f559663c3ffc61af164a2ff35385e
-EBUILD memtest86-3.4.ebuild 1919 RMD160 fc30c20e1ec9190432b6449aea774a30b02c0fb7 SHA1 1850ffacf64a6ae0da16e5efe4560ca0b4326d82 SHA256 4fae98dd1f50604142150bbf10b04253897ad4178f4e30099a9b130b6b600b4a
-MISC ChangeLog 5114 RMD160 74b31e42984e884ff662f3aca8a80d187fb53135 SHA1 6ae947e7b82bba22318e6a64a879616a885b4bd2 SHA256 caba17be6b1a8cfcb6cfc5b3a7bb24866df7f61ed96fa6df2c2300a899d8275b
+EBUILD memtest86-3.3.ebuild 1386 RMD160 6f9e3c91380ad7c79614ae8a2b157ddab67f1124 SHA1 7b4a1ff5d1c07caa140988ab85c2361ddc0c13bb SHA256 f5cdd0271445f275e08ace9cc7d1f7718ae5ac88a6c41c01442ffc9f9b2e266a
+EBUILD memtest86-3.4.ebuild 1367 RMD160 0d7ec244f04b32412ebe4ea54aefe27707dad52f SHA1 08009166afe603226ab56f9390c9b11c03a59303 SHA256 43bfca59267fda97cba428c73a7aac57bbf0a39352ec0cfc2330cfed00e5452b
+MISC ChangeLog 5281 RMD160 c5d3c2079673ac412907b0b01ebf3e4b58d5c573 SHA1 5ad36d528341a725b731ca8809380d971ad91635 SHA256 df625d63e5d2de64b643b0eedc7bd6aaeee15d525180cd4adea6f90b45b2154a
 MISC metadata.xml 241 RMD160 86f0a529b00ddd6915b76083c4f1e2db8598fae1 SHA1 70234d532f1b867dfc34bd936fb34a7015fa90ed SHA256 bd2bd1cf924d8626e469ed4c8780d7a11c8b629ce102d654b3ca0022a7f4254e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkjfY8AACgkQchej4aZK9/fTPQCeOl/uoDIMd3drVIY3qiIuBw0z
-yZAAnj96o6EWSajiqie1wadgNspuWrIM
-=kB0k
+iEYEARECAAYFAknGrgcACgkQchej4aZK9/f/WgCfUDMYfr6KnAQwY5vY/+1BdevY
+KZYAn1vJV6YKYkhbjyKE+G7R6etArbOv
+=OSK4
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86/memtest86-3.3.ebuild b/sys-apps/memtest86/memtest86-3.3.ebuild
index b03f16dd9d4f..b07918ff6a5a 100644
--- a/sys-apps/memtest86/memtest86-3.3.ebuild
+++ b/sys-apps/memtest86/memtest86-3.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild,v 1.3 2007/10/13 14:14:52 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.3.ebuild,v 1.4 2009/03/22 21:30:38 spock Exp $
 
 inherit mount-boot eutils
 
@@ -43,30 +43,10 @@ pkg_postinst() {
 	einfo "memtest.bin has been installed in /boot/memtest86/"
 	einfo "You may wish to update your bootloader configs"
 	einfo "by adding these lines:"
-	einfo " - For grub:"
+	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
+	einfo "    > root (hd?,?)"
 	einfo "    > title=Memtest86"
-
-	# a little magic to make users' life as easy as possible ;)
-	bootpart=0
-	root="(hd0,0)"
-	res=`grep /boot /etc/fstab | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'`
-	if [ -n "${res}" ] ; then
-		bootpart=1
-	else
-		res=`grep -v '^#' /etc/fstab | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | awk '{print $1}'`
-	fi
-
-	if [ -n "${res}" ] ; then
-		root=`echo ${res} | grep -o '[a-z][0-9]' | tr -t a-z 0123456789 | sed -e 's/\([0-9]\)\([0-9]\)/\1 \2/' | awk '{print "(hd" $1 "," $2-1 ")" }'`
-	fi
-
-	einfo "    > root ${root}"
-	if [ "${bootpart}" -eq 1 ] ; then
-		einfo "    > kernel /memtest86/memtest.bin"
-	else
-		einfo "    > kernel /boot/memtest86/memtest.bin"
-	fi
-
+	einfo "    > kernel /boot/memtest86/memtest.bin"
 	einfo " - For lilo:"
 	einfo "    > image  = /boot/memtest86/memtest.bin"
 	einfo "    > label  = Memtest86"
diff --git a/sys-apps/memtest86/memtest86-3.4.ebuild b/sys-apps/memtest86/memtest86-3.4.ebuild
index 4c92e7fcd70e..72f46be346fd 100644
--- a/sys-apps/memtest86/memtest86-3.4.ebuild
+++ b/sys-apps/memtest86/memtest86-3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild,v 1.1 2008/01/19 22:10:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-3.4.ebuild,v 1.2 2009/03/22 21:30:38 spock Exp $
 
 inherit mount-boot eutils
 
@@ -43,30 +43,10 @@ pkg_postinst() {
 	einfo "memtest.bin has been installed in /boot/memtest86/"
 	einfo "You may wish to update your bootloader configs"
 	einfo "by adding these lines:"
-	einfo " - For grub:"
+	einfo " - For grub: (replace '?' with correct numbers for your boot partition)"
 	einfo "    > title=Memtest86"
-
-	# a little magic to make users' life as easy as possible ;)
-	bootpart=0
-	root="(hd0,0)"
-	res=`grep /boot /etc/fstab | grep -v "^#" | awk '{print $1}' | grep '/dev/hd[a-z0-9]\+'`
-	if [ -n "${res}" ] ; then
-		bootpart=1
-	else
-		res=`grep -v '^#' /etc/fstab | grep -e '/dev/hd[a-z0-9]\+[[:space:]]\+\/[[:space:]]\+' | awk '{print $1}'`
-	fi
-
-	if [ -n "${res}" ] ; then
-		root=`echo ${res} | grep -o '[a-z][0-9]' | tr -t a-z 0123456789 | sed -e 's/\([0-9]\)\([0-9]\)/\1 \2/' | awk '{print "(hd" $1 "," $2-1 ")" }'`
-	fi
-
-	einfo "    > root ${root}"
-	if [ "${bootpart}" -eq 1 ] ; then
-		einfo "    > kernel /memtest86/memtest.bin"
-	else
-		einfo "    > kernel /boot/memtest86/memtest.bin"
-	fi
-
+	einfo "    > root (hd?,?)"
+	einfo "    > kernel /boot/memtest86/memtest.bin"
 	einfo " - For lilo:"
 	einfo "    > image  = /boot/memtest86/memtest.bin"
 	einfo "    > label  = Memtest86"