mount-boot eclass; #7903

4 files changed, 36 insertions, 93 deletions

diff --git a/sys-apps/grub/ChangeLog b/sys-apps/grub/ChangeLog
index 88171e587810..32a1103885b1 100644
--- a/sys-apps/grub/ChangeLog
+++ b/sys-apps/grub/ChangeLog
@@ -1,29 +1,15 @@
 # ChangeLog for sys-apps/grub
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/ChangeLog,v 1.9 2002/08/19 18:11:36 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/ChangeLog,v 1.10 2002/09/30 01:30:15 woodchip Exp $
 
-*grub-0.91-r3 (19 Aug 2002)
-
-  19 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> grub-0.91-r3.ebuild, ChangeLog :
-  
-  Added -ppc to keywords
+*grub-0.92 (25 Jun 2002)
 
-*grub-0.92.ebuild (13 Aug 2002)
+  29 Sep 2002; Donny Davies <woodchip@gentoo.org> grub-0.92.ebuild :
+  Now uses mount-boot eclass; from #7903.
 
   13 Aug 2002; Joachim Blaabjerg <styx@gentoo.org> grub-0.92.ebuild :
-
   Added grub-0.92-usbfix.patch to hopefully fix bug #6372. It still compiles!
 
-*grub-0.90-r7.ebuild (14 July 2002)
-
-  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
-  updated keywords (-ppc -sparc -sparc64)
-
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> grub-0.90-r7.ebuild :
-  Added KEYWORDS.
-
-*grub-0.92 (25 Jun 2002)
-
   14 Jul 2002; phoen][x <phoenix@gentoo.org> grub-0.92.ebuild :
   Added KEYWORDS.
 
@@ -33,9 +19,26 @@
   as well as move splash.xpm.gz to ${FILESDIR}/, as having three
   seems a bit much.
 
+*grub-0.90-r7 (14 July 2002)
+
+  29 Sep 2002; Donny Davies <woodchip@gentoo.org> grub-0.90-r7.ebuild :
+  Now uses mount-boot eclass; from #7903.
+
+  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
+  updated keywords (-ppc -sparc -sparc64)
+
+  14 Jul 2002; phoen][x <phoenix@gentoo.org> grub-0.90-r7.ebuild :
+  Added KEYWORDS.
+
 *grub-0.90-r4 (8 Mar 2002)
 *grub-0.91-r3 (8 Mar 2002)
 
+  29 Sep 2002; Donny Davies <woodchip@gentoo.org> grub-0.91-r3.ebuild :
+  Now uses mount-boot eclass; from #7903.
+
+  19 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> grub-0.91-r3.ebuild :
+  Added -ppc to keywords
+
   14 Jul 2002; phoen][x <phoenix@gentoo.org> grub-0.91-r3.ebuild :
   Added KEYWORDS.
 
@@ -56,8 +59,7 @@
 
 *grub-0.90-r5 (4 Feb 2002)
 
-  4 Feb 2002; G.Bevin <gbevin@gentoo.org> grub-0.90-r5.ebuild, grub-0.91.ebuild :
-  
+  4 Feb 2002; G.Bevin <gbevin@gentoo.org> grub-0.90-r5.ebuild, grub-0.91.ebuild :  
   Added new setup function which detects if /boot is mounted or not, in case
   it's not mounted it will try to do it automatically and in case of a failure
   exit with an error message.
diff --git a/sys-apps/grub/grub-0.90-r7.ebuild b/sys-apps/grub/grub-0.90-r7.ebuild
index a2531671fc0c..98eb79f4acf0 100644
--- a/sys-apps/grub/grub-0.90-r7.ebuild
+++ b/sys-apps/grub/grub-0.90-r7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.90-r7.ebuild,v 1.6 2002/08/19 18:11:37 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.90-r7.ebuild,v 1.7 2002/09/30 01:30:15 woodchip Exp $
+
+inherit mount-boot
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU GRUB boot loader"
@@ -10,29 +12,10 @@ KEYWORDS="x86 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="virtual/glibc >=sys-devel/binutils-2.9.1.0.23 >=sys-libs/ncurses-5.2-r2 sys-apps/grep sys-apps/sed"
+DEPEND="virtual/glibc >=sys-devel/binutils-2.9.1.0.23 >=sys-libs/ncurses-5.2-r2"
 RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
 
-pkg_setup() {
-	[ "$ROOT" != "/" ] && return 0
-	#If the user doesn't have a /boot or /mnt/boot filesystem, skip.
-	[ -z "`grep /boot /etc/fstab | grep -v "^[ \t]*#"`" ] || return 0 
-	local myboot
-	myboot=`cat /etc/fstab | grep -v ^# | grep /boot | sed -e 's/^[^[:space:]]*[[:space:]]*\([^[:space:]]*\).*$/\1/'`
-	[ `cat /proc/mounts | cut -f2 -d" " | grep $myboot` ] && return 0
-	mount $myboot
-	if [ $? -ne 0 ]
-	then
-		eerror "GRUB installation requires that $myboot is mounted or mountable."
-		eerror "If you do not have a seperate /boot partition please remove any"
-		eerror "/boot entries from /etc/fstab and make sure /boot exists."
-		eerror ""
-		eerror "Unable to mount $myboot automatically; exiting."
-		die "Please mount your $myboot filesystema and remerge this ebuild."
-	fi
-}
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
 	patch -p1 < ${FILESDIR}/${P}/grub-0.5.97-vga16.patch || die
diff --git a/sys-apps/grub/grub-0.91-r3.ebuild b/sys-apps/grub/grub-0.91-r3.ebuild
index 9efaef9cc77c..571dab7227df 100644
--- a/sys-apps/grub/grub-0.91-r3.ebuild
+++ b/sys-apps/grub/grub-0.91-r3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.91-r3.ebuild,v 1.6 2002/08/19 18:11:37 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.91-r3.ebuild,v 1.7 2002/09/30 01:30:15 woodchip Exp $
 
+inherit mount-boot
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU GRUB boot loader"
@@ -11,28 +12,9 @@ KEYWORDS="x86 -ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
-DEPEND="virtual/glibc >=sys-devel/binutils-2.9.1.0.23 >=sys-libs/ncurses-5.2-r2 sys-apps/grep sys-apps/sed"
+DEPEND="virtual/glibc >=sys-devel/binutils-2.9.1.0.23 >=sys-libs/ncurses-5.2-r2"
 RDEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
 
-pkg_setup() {
-	[ "$ROOT" != "/" ] && return 0
-	#If the user doesn't have a /boot or /mnt/boot filesystem, skip.
-	[ -z "`grep /boot /etc/fstab | grep -v "^[ \t]*#"`" ] || return 0 
-	local myboot
-	myboot=`cat /etc/fstab | grep -v ^# | grep /boot | sed -e 's/^[^[:space:]]*[[:space:]]*\([^[:space:]]*\).*$/\1/'`
-	[ `cat /proc/mounts | cut -f2 -d" " | grep $myboot` ] && return 0
-	mount $myboot
-	if [ $? -ne 0 ]
-	then
-		eerror "GRUB installation requires that $myboot is mounted or mountable."
-		eerror "If you do not have a seperate /boot partition please remove any"
-		eerror "/boot entries from /etc/fstab and make sure /boot exists."
-		eerror ""
-		eerror "Unable to mount $myboot automatically; exiting."
-		die "Please mount your $myboot filesystema and remerge this ebuild."
-	fi
-}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -71,8 +53,7 @@ src_compile() {
 		-malign-functions=1 -Wundef" || die "Building failed."
 }
 
-src_install() {
-	
+src_install() {	
 	make prefix=${D}/usr \
 		sbindir=${D}/sbin \
 		mandir=${D}/usr/share/man \
@@ -100,4 +81,3 @@ pkg_postinst() {
 		einfo "*** If you\'re using XFS, unmount and remount /boot as well."
 	fi
 }
-
diff --git a/sys-apps/grub/grub-0.92.ebuild b/sys-apps/grub/grub-0.92.ebuild
index b6edbe3b7a93..b4e6e3c15f64 100644
--- a/sys-apps/grub/grub-0.92.ebuild
+++ b/sys-apps/grub/grub-0.92.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/sys-apps/grub/grub-0.90-r7.ebuild,v 1.1 2002/03/08 08:54:04 blocke Exp
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.92.ebuild,v 1.8 2002/09/30 01:30:15 woodchip Exp $
+
+inherit mount-boot
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU GRUB boot loader"
@@ -11,33 +13,11 @@ SLOT="0"
 LICENSE="GPL-2"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5"
+DEPEND="${RDEPEND}"
 
-DEPEND="${RDEPEND}
-	sys-apps/grep 
-	sys-apps/sed"
-	
-pkg_setup() {
-	[ "$ROOT" != "/" ] && return 0
-	#If the user doesn't have a /boot or /mnt/boot filesystem, skip.
-	[ -z "`grep /boot /etc/fstab | grep -v "^[ \t]*#"`" ] || return 0 
-	local myboot
-	myboot=`cat /etc/fstab | grep -v ^# | grep /boot | sed -e 's/^[^[:space:]]*[[:space:]]*\([^[:space:]]*\).*$/\1/'`
-	[ `cat /proc/mounts | cut -f2 -d" " | grep $myboot` ] && return 0
-	mount $myboot
-	if [ $? -ne 0 ]
-	then
-		eerror "GRUB installation requires that $myboot is mounted or mountable."
-		eerror "If you do not have a seperate /boot partition please remove any"
-		eerror "/boot entries from /etc/fstab and make sure /boot exists."
-		eerror ""
-		eerror "Unable to mount $myboot automatically; exiting."
-		die "Please mount your $myboot filesystema and remerge this ebuild."
-	fi
-}
 src_unpack() {
-
-	unpack ${A}
-	cd ${S}
+	unpack ${A} || die
+	cd ${S} || die
 	patch -p1 < ${FILESDIR}/${P}/grub-0.92-vga16.patch || die
 	patch -p1 < ${FILESDIR}/${P}/grub-0.5.96.1-special-raid-devices.patch || die
 	patch -p1 < ${FILESDIR}/${P}/grub-0.90-configfile.patch || die
@@ -55,7 +35,6 @@ src_unpack() {
 	patch -p0 < ${FILESDIR}/${P}/grub-0.92-nodeprecatedflags.patch || die
 	patch -p1 < ${FILESDIR}/${P}/grub-0.91-vga16-serial.patch || die
 	patch -p1 < ${FILESDIR}/${P}/grub-0.92-usbfix.patch || die
-
 }
 
 src_compile() {
@@ -102,4 +81,3 @@ pkg_postinst() {
 		einfo "*** Note that menu.lst now is called grub.conf."
 	fi
 }
-