more cleanups; example file addition

5 files changed, 218 insertions, 17 deletions

diff --git a/sys-apps/lilo/ChangeLog b/sys-apps/lilo/ChangeLog
index a6bcd95ee3dd..dffe0e2ca299 100644
--- a/sys-apps/lilo/ChangeLog
+++ b/sys-apps/lilo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/lilo
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.27 2003/07/16 22:00:00 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.28 2003/07/17 21:10:26 azarah Exp $
+
+*lilo-22.5.6-r2 (17 Jul 2003)
+
+  17 Jul 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.6-r2.ebuild,
+  files/lilo.conf:
+  More cleanups.  Remove the loaders (*.b files), as they are no longer needed.
+  Add the 'disk=' examples to lilo.conf (bug #24035), thanks to Kidion
+  <david_en_clarina@zonnet.nl>.
 
   16 Jul 2003; Martin Schlemmer <azarah@gentoo.org> lilo-22.5.6-r1.ebuild:
   Cleanup the build again.  Fix my BOOTS kludge, and remove the patch.
diff --git a/sys-apps/lilo/Manifest b/sys-apps/lilo/Manifest
index 1f84d4e8bd23..ce324da59472 100644
--- a/sys-apps/lilo/Manifest
+++ b/sys-apps/lilo/Manifest
@@ -1,13 +1,14 @@
-MD5 83edae3aab3208d18ea1307538aa00f7 ChangeLog 4399
+MD5 edb3836a798dea556520c9231ad7a97e ChangeLog 4708
 MD5 d6daac26992f472c13439776f9262b58 lilo-22.1-r3.ebuild 1583
 MD5 ce88b98514e48eeb2fc2005bd2e7c6f4 lilo-22.3.3-r1.ebuild 1999
 MD5 9196bc4123ba28cd71702b2d7b6ba983 lilo-22.3.4.ebuild 2004
 MD5 4ec5fe27915d3d095bcaf8d987d22d0c lilo-22.5.5.ebuild 4615
 MD5 4245de72490b9ab5e6921430280995b7 lilo-22.5.1.ebuild 4533
-MD5 cb9abcecc0bd21f869d9be568c435ab8 lilo-22.5.6-r2.ebuild 3477
+MD5 1d3b0333514cd06f5d53992c773c42cf lilo-22.5.6-r1.ebuild 4159
+MD5 01bd0c419e2f78240949543992494dc8 lilo-22.5.6-r2.ebuild 3540
 MD5 00de3473e03e180faad32ed00335cc7b files/digest-lilo-22.1-r3 61
 MD5 0a868ea4abd215e2181c6c756173b618 files/digest-lilo-22.3.3-r1 133
-MD5 1cf59b8b3ab9d53d69b819cb2465f9b0 files/lilo.conf 1719
+MD5 e49971bcdc078d20a99ef4359d1fe78c files/lilo.conf 1718
 MD5 93ff7a7535e7c8ff1327db52a3118bef files/digest-lilo-22.3.4 133
 MD5 f3c42e3a8ba9c0623ba4554ba22196ac files/digest-lilo-22.5.5 63
 MD5 23a4be524696dfdaefa80c1bdac39fc7 files/digest-lilo-22.5.6-r1 63
diff --git a/sys-apps/lilo/files/digest-lilo-22.5.6-r2 b/sys-apps/lilo/files/digest-lilo-22.5.6-r2
new file mode 100644
index 000000000000..5cd39211f2f0
--- /dev/null
+++ b/sys-apps/lilo/files/digest-lilo-22.5.6-r2
@@ -0,0 +1 @@
+MD5 fd85e0cd157e77c1f565dbe649cbaaab lilo-22.5.6.tar.gz 406705
diff --git a/sys-apps/lilo/files/lilo.conf b/sys-apps/lilo/files/lilo.conf
index 1b0d24e4c7d5..ca9afa8356fb 100644
--- a/sys-apps/lilo/files/lilo.conf
+++ b/sys-apps/lilo/files/lilo.conf
@@ -1,31 +1,73 @@
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/files/lilo.conf,v 1.3 2002/09/30 00:55:18 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/files/lilo.conf,v 1.4 2003/07/17 21:10:26 azarah Exp $
 # Author: Ultanium
+
+#
 # Start LILO global section
-menu-scheme=Wb
-boot = /dev/hda
-prompt
-#boot=/devices/discs/disc0/disc
-map = /boot/System.map
-#compact    	# faster, but won't work on all systems.
+#
+
+# Faster, but won't work on all systems:
+#compact
+# Should work for most systems, and do not have the sector limit:
 lba32
-#if lba32 do not work, use linear
+# If lba32 do not work, use linear:
 #linear
-#if you always want to see the prompt with a 15 second timeout:
+
+# MBR to install LILO to:
+boot = /dev/hda
+map = /boot/.map
+
+# If you are having problems booting from a hardware raid-array
+# or have a unusual setup, try this:
+#disk=/dev/ataraid/disc0/disc bios=0x80  # see this as the first BIOS disk
+#disk=/dev/sda bios=0x81                 # see this as the second BIOS disk
+#disk=/dev/hda bios=0x82                 # see this as the third BIOS disk
+
+# Here you can select the secondary loader to install.  A few
+# examples is:
+#
+#    boot-text.b
+#    boot-menu.b
+#    boot-bmp.b
+#
+install = /boot/boot-menu.b   # Note that for lilo-22.5.5 or later you
+                              # do not need boot-{text,menu,bmp}.b in
+                              # /boot, as they are linked into the lilo
+                              # binary.
+
+menu-scheme=Wb
+prompt
+# If you always want to see the prompt with a 15 second timeout:
 #timeout=150
 delay = 50
-vga = normal	# Normal VGA console                               
+# Normal VGA console
+vga = normal
+# VESA console with size 1024x768x16:
+#vga = 791
+
+#
 # End LILO global section
+#
+
+#
 # Linux bootable partition config begins
-	image = /boot/bzImage
+#
+image = /boot/bzImage
 	root = /dev/hda3
 	#root = /devices/discs/disc0/part3
 	label = Gentoo
 	read-only # read-only for checking
+#
 # Linux bootable partition config ends
+#
+
+#
 # DOS bootable partition config begins
-	other = /dev/hda1
+#
+other = /dev/hda1
 	#other = /devices/discs/disc0/part1
 	label = Windows
 	table = /dev/hda
+#
 # DOS bootable partition config ends  
-	
+#
+
diff --git a/sys-apps/lilo/lilo-22.5.6-r2.ebuild b/sys-apps/lilo/lilo-22.5.6-r2.ebuild
new file mode 100644
index 000000000000..32f650b362b8
--- /dev/null
+++ b/sys-apps/lilo/lilo-22.5.6-r2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.5.6-r2.ebuild,v 1.1 2003/07/17 21:10:26 azarah Exp $
+
+inherit mount-boot eutils
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Standard Linux boot loader"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${P}.tar.gz
+		ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/obsolete/${P}.tar.gz"
+#	mirror://gentoo/${P}-gentoo.diff.bz2"
+HOMEPAGE="http://brun.dyndns.org/pub/linux/lilo/"
+
+SLOT="0"
+LICENSE="BSD GPL-2"
+KEYWORDS="-* ~x86"
+
+DEPEND="dev-lang/nasm
+	>=sys-devel/bin86-0.15.5"
+
+PROVIDE="virtual/bootloader"
+
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	# This bootlogo patch is borrowed from SuSE Linux.
+	# You should see Raphaël Quinet's (quinet@gamers.org) website,
+	# http://www.gamers.org/~quinet/lilo/index.html
+#	epatch ${DISTDIR}/${P}-gentoo.diff.bz2
+}
+
+src_compile() {
+	emake CC="${CC:=gcc}" lilo || die
+}
+
+src_install() {
+	keepdir /boot
+	make ROOT=${D} install || die
+	into /usr
+	dosbin keytab-lilo.pl
+	
+	insinto /etc
+	newins ${FILESDIR}/lilo.conf lilo.conf.example
+	
+	doman manPages/*.[5-8]
+	dodoc CHANGES COPYING INCOMPAT README*
+	docinto samples ; dodoc sample/*
+}
+
+pkg_preinst() {
+	mount-boot_mount_boot_partition
+}
+
+# Check whether LILO is installed
+# This function is from /usr/sbin/mkboot from debianutils, with copyright:
+#
+#   Debian GNU/Linux
+#   Copyright 1996-1997 Guy Maor <maor@debian.org>
+#
+# Modified for Gentoo for use with the lilo ebuild by:
+#   Martin Schlemmer <azarah@gentoo.org> (16 Mar 2003)
+#
+lilocheck () {
+	local bootpart=
+	local rootpart="$(rdev 2> /dev/null | cut -d ' ' -f 1 2> /dev/null)"
+	
+	echo
+    einfon "Checking for LILO ..."
+	
+    if [ "$(whoami)" != "root" ]
+	then
+		echo; echo
+        eerror "Only root can check for LILO!"
+        return 1
+    fi
+
+	if [ -z "${rootpart}" ]
+	then
+		echo; echo
+		eerror "Could not determine root partition!"
+		return 1
+	fi
+	
+    if [ ! -f /etc/lilo.conf -o ! -x /sbin/lilo ]
+	then
+        echo " No"
+        return 1
+    fi
+	
+    bootpart="$(perl -ne 'print $1 if /^\s*boot\s*=\s*(\S*)/' /etc/lilo.conf)"
+	
+    if [ -z "${bootpart}" ]
+	then
+        # lilo defaults to current root when 'boot=' is not present
+        bootpart="${rootpart}"
+    fi
+	
+    if ! dd if=${bootpart} ibs=16 count=1 2>&- | grep -q 'LILO'
+	then
+		echo; echo
+        ewarn "Yes, but I couldn't find a LILO signature on ${bootpart}"
+        ewarn "Check your /etc/lilo.conf, or run /sbin/lilo by hand."
+        return 1
+    fi
+	
+    echo " Yes, on ${bootpart}"
+	
+    return 0
+}
+
+
+pkg_postinst() {
+	if [ ! -e ${ROOT}/boot/boot.b -a ! -L ${ROOT}/boot/boot.b ]
+	then
+		[ -f "${ROOT}/boot/boot-menu.b" ] && \
+			ln -snf boot-menu.b ${ROOT}/boot/boot.b
+	fi
+
+	if [ "${ROOT}" = "/" ]
+	then
+		if lilocheck
+		then
+			einfo "Running LILO to complete the install ..."
+			# do not redirect to /dev/null because it may display some input
+			# prompt
+			/sbin/lilo 
+			if [ "$?" -ne 0 ]
+			then
+				echo
+				ewarn "Running /sbin/lilo failed!  Please check what the problem is"
+				ewarn "before your next reboot."
+				
+				echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
+				echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
+				sleep 5
+			fi
+		fi
+		echo
+	fi
+
+	echo
+	einfo "Please note that all the loader files (/boot/*.b) is now linked"
+	einfo "into LILO, and thus no longer installed."
+	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
+	sleep 3
+	echo
+}
+