sync pkg_setup() + add sample lilo.conf

5 files changed, 38 insertions, 106 deletions

diff --git a/sys-apps/lilo/ChangeLog b/sys-apps/lilo/ChangeLog
index a56dffe5c1f1..4c8a707a1a6e 100644
--- a/sys-apps/lilo/ChangeLog
+++ b/sys-apps/lilo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/lilo
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.6 2002/04/06 07:55:54 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.7 2002/04/09 03:36:31 woodchip Exp $
+
+*lilo-21.7.5-r2 (8 Apr 2002)
+
+  8 Apr 2002; Donny Davies <woodchip@gentoo.org> lilo-21.7.5-r2.ebuild,
+  lilo-21.7.5-r1.ebuild, lilo-22.1-r2.ebuild :
+
+  Sync pkg_setup() with lilo-22.1-r3 and added the sample lilo.conf.
+  Removed the stale ebuilds.
 
 *lilo-22.1-r3 (5 Apr 2002)
 
@@ -10,11 +18,9 @@
 
   18 Feb 2002; Donny Davies <woodchip@gentoo.org> lilo-21.7.5-r1.ebuild :
   
-  Cleaned up the comments I left behind in .ebuild.  Also added the pkg_setup() from
-  lilo-22.1 into this one.. good stuff.  ATTN Maintainers:  This lilo has the
-  patches from SuSe for animated boot logo stuff, quite fun, so please dont go
-  deleting it because its simply older than the lilo-22.1 version in portage!
-  I deleted the stale ebuilds to simply the situation.
+  ATTN Maintainers:  This lilo has the patches from SuSe for animated boot
+  logos.  Please dont delete it simply because it's older than the lilo-22.1
+  version in portage!
 
 *lilo-22.1-r2 (4 Feb 2002)
 
@@ -28,8 +34,7 @@
 
   2 Feb 2002; Donny Davies <woodchip@gentoo.org> lilo-22.1-r1.ebuild:
 
-  Added several patches from SuSE for animated boot logos.  Not completly finished
-  yet, but totally usable.  Please read the ebuild first before merging this!
+  Added several patches from SuSE for animated boot logos.
   Get animations at: http://www.gamers.org/~quinet/lilo/index.html.
 
 *lilo-22.1-r1 (1 Feb 2002)
diff --git a/sys-apps/lilo/files/digest-lilo-21.7.5-r1 b/sys-apps/lilo/files/digest-lilo-21.7.5-r2
index c52f06673f33..c52f06673f33 100644
--- a/sys-apps/lilo/files/digest-lilo-21.7.5-r1
+++ b/sys-apps/lilo/files/digest-lilo-21.7.5-r2
diff --git a/sys-apps/lilo/files/digest-lilo-22.1-r2 b/sys-apps/lilo/files/digest-lilo-22.1-r2
deleted file mode 100644
index cec554c6e99d..000000000000
--- a/sys-apps/lilo/files/digest-lilo-22.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba6830b939e6eeaadf450c68c96a42fb lilo-22.1.tar.gz 319754
diff --git a/sys-apps/lilo/lilo-21.7.5-r1.ebuild b/sys-apps/lilo/lilo-21.7.5-r2.ebuild
index 0434c8bd56db..c7ccba46085e 100644
--- a/sys-apps/lilo/lilo-21.7.5-r1.ebuild
+++ b/sys-apps/lilo/lilo-21.7.5-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-21.7.5-r1.ebuild,v 1.2 2002/02/19 04:28:54 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-21.7.5-r2.ebuild,v 1.1 2002/04/09 03:36:31 woodchip Exp $
 
 #
-# This lilo has the Suse animated bootlogo patches.. fun stuff.
+# This lilo has the Suse animated bootlogo patches.. fun!
 #
 
 S=${WORKDIR}/${P}
@@ -15,13 +15,20 @@ DEPEND="virtual/glibc >=sys-devel/bin86-0.15.5"
 RDEPEND="virtual/glibc"
 
 pkg_setup() {
-	if [ `cut -f 2 -d " " /proc/mounts | grep "/boot"` ]
+	[ "${ROOT}" != "/" ] && return 0
+	. ${ROOT}/etc/init.d/functions.sh
+	local fstabstate="$(cat /etc/fstab |grep -v -e '#' |awk '{print $2}')"
+	local procstate="$(cat /proc/mounts |awk '{print $2}')"
+	if [ -n "$(echo ${fstabstate} |grep -e "/boot")" ] && \
+	   [ -n "$(echo ${procstate} |grep -e "/boot")" ]
 	then
 		einfo "Your boot partition was detected as being mounted as /boot."
 		einfo "Files will be installed there for lilo to function correctly."
-	else
-		mount /boot
-		if [ `cut -f 2 -d " " /proc/mounts | grep "/boot"` ]
+	elif [ -n "$(echo ${fstabstate} |grep -e "/boot")" ] && \
+	     [ -z "$(echo ${procstate} |grep -e "/boot")" ]
+	then
+		mount /boot &>/dev/null
+		if [ "$?" -eq 0 ]
 		then
 			einfo "Your boot partition was not mounted as /boot, but portage was able to mount"
 			einfo "it without additional intervention."
@@ -31,6 +38,8 @@ pkg_setup() {
 			eerror "can continue. Lilo needs to install important files there."
 			die "Please mount your /boot partition."
 		fi
+	else
+		einfo "You do not have a seperate /boot partition."
 	fi
 }
 
@@ -61,6 +70,9 @@ src_install() {
 	doins boot-text.b boot-menu.b chain.b os2_d.b
 	doman manPages/*.[5-8]
 	dodoc CHANGES COPYING INCOMPAT QuickInst README*
+
+	insinto /etc
+	newins ${FILESDIR}/lilo.conf lilo.conf.example
 }
 
 pkg_preinst() {
@@ -87,12 +99,13 @@ pkg_postinst() {
 	einfo "Activating boot-menu..."
 	ln -sf boot-menu.b $ROOT/boot/boot.b
 
-	einfo "You need to put: message=/boot/foo.boot in your"
-	einfo "/etc/lilo.conf global section."
 	echo
-	einfo "See http://www.gamers.org/~quinet/lilo/index.html"
-	einfo "for downloadable animations.  Put them in your"
-	einfo "/boot directory."
+	echo "*****************************************************"
+	echo "* You need to use: message=/boot/foo.boot in your   *"
+	echo "* /etc/lilo.conf global section.                    *"
+	echo "*                                                   *"
+	echo "* See http://www.gamers.org/~quinet/lilo/index.html *"
+	echo "* for downloadable animations.                      *"
+	echo "*****************************************************"
 	echo
-	einfo "Have fun :>"
 }
diff --git a/sys-apps/lilo/lilo-22.1-r2.ebuild b/sys-apps/lilo/lilo-22.1-r2.ebuild
deleted file mode 100644
index 8b9dcdfe7a8a..000000000000
--- a/sys-apps/lilo/lilo-22.1-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.1-r2.ebuild,v 1.1 2002/02/04 12:52:58 gbevin Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Standard Linux boot loader"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${P}.tar.gz"
-
-DEPEND="virtual/glibc >=sys-devel/bin86-0.15.5"
-
-RDEPEND="virtual/glibc"
-
-pkg_setup() {
-	if [ `cut -f 2 -d " " /proc/mounts | grep "/boot"` ]
-	then
-		einfo "Your boot partition was detected as being mounted as /boot."
-		einfo "Files will be installed there for lilo to function correctly."
-	else
-		mount /boot
-		if [ `cut -f 2 -d " " /proc/mounts | grep "/boot"` ]
-		then
-			einfo "Your boot partition was not mounted as /boot, but portage was able to mount"
-			einfo "it without additional intervention."
-			einfo "Files will be installed there for lilo to function correctly."
-		else
-			eerror "Your boot partition has to be mounted on /boot before the installation"
-			eerror "can continue. Lilo needs to install important files there."
-			die "Please mount your /boot partition."
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-g:${CFLAGS}:" Makefile.orig > Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	into /
-	dosbin lilo
-	into /usr
-	dosbin keytab-lilo.pl
-	dodir /boot
-	insinto /boot
-	doins boot-text.b boot-menu.b boot-bmp.b chain.b os2_d.b
-	doman manPages/*.[5-8]
-	dodoc CHANGES COPYING INCOMPAT QuickInst README*
-}
-
-pkg_preinst() {
-	if [ ! -L $ROOT/boot/boot.b -a -f $ROOT/boot/boot.b ]
-	then
-		echo "Saving old boot.b..."
-		mv $ROOT/boot/boot.b $ROOT/boot/boot.old; 
-	fi
-
-	if [ ! -L $ROOT/boot/chain.b -a -f $ROOT/boot/chain.b ]
-	then
-		echo "Saving old chain.b..."
-		mv $ROOT/boot/chain.b $ROOT/boot/chain.old;
-	fi
-
-	if [ ! -L $ROOT/boot/os2_d.b -a -f $ROOT/boot/os2_d.b ]
-	then
-		echo "Saving old os2_d.b..."
-		mv $ROOT/boot/os2_d.b $ROOT/boot/os2_d.old;
-	fi
-}
-
-pkg_postinst() {
-
-	. ${ROOT}/etc/init.d/functions.sh
-
-	einfo "Activating boot-menu..."
-	ln -sf boot-menu.b $ROOT/boot/boot.b;
-}
-
-