Restricted more dolilo functionality with a config option. Adjusted einfo's to match. Bumping, previous dolilo can break working configs.

4 files changed, 19 insertions, 11 deletions

diff --git a/sys-boot/lilo/ChangeLog b/sys-boot/lilo/ChangeLog
index ad5c84e3e0d0..5efa352d47ce 100644
--- a/sys-boot/lilo/ChangeLog
+++ b/sys-boot/lilo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/lilo
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.17 2004/07/03 18:58:35 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/ChangeLog,v 1.18 2004/07/11 15:41:22 chainsaw Exp $
+
+*lilo-22.5.9-r2 (11 Jul 2004)
+
+  11 Jul 2004; Tony Vroon <chainsaw@gentoo.org> -lilo-22.5.9-r1.ebuild,
+  +lilo-22.5.9-r2.ebuild:
+  Dolilo no longer moves images by default as this could break working configs
+  with a different naming scheme. Sanity checks are only run if MOVEIMAGES is
+  enabled, as they aren't necessary otherwise.
 
 *lilo-22.5.9-r1 (03 Jul 2004)
 
diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index 6c8576614b35..7aca3ec914d9 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -1,9 +1,9 @@
 MD5 aaba1e239412a893dd30b8ce53603d26 lilo-22.5.8-r2.ebuild 4451
-MD5 20b23f61382cd1d618ce036dc23c4606 lilo-22.5.9-r1.ebuild 5297
 MD5 fcf6e453bb787b12ca84de9773e0655c lilo-22.5.8-r1.ebuild 4335
 MD5 0b4fc8ce5ee804af28889d87991dd8d2 lilo-22.5.8-r3.ebuild 4627
 MD5 566aa7affcfb6e2e37c3f38e0e655325 lilo-22.5.8.ebuild 4044
-MD5 11554dfb29bd5ba6a4497bf93242dd2e ChangeLog 359
+MD5 be6405772d1ca1153f82ef8acdfec6a9 lilo-22.5.9-r2.ebuild 5195
+MD5 95df02cd7afc6d4dbf87e30802119eff ChangeLog 693
 MD5 eeee4743c4e463eeed3a7a4c15380e0d metadata.xml 254
 MD5 45847050f78ebbd2b2d89c03f6a08fb4 files/lilo-22.5.8-devmapper_gentoo.patch 11889
 MD5 ab2657bc635313522eb791e30b1166ef files/lilo-22.5.9-correct-usage-info.patch 683
@@ -11,11 +11,11 @@ MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8 63
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r1 63
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r2 63
 MD5 15b1ea46b95a7517e5207c63b2252fe6 files/digest-lilo-22.5.8-r3 63
-MD5 40f4a24227338f8fae1e5996bae46576 files/digest-lilo-22.5.9-r1 124
+MD5 925f55c96304e240bdb20cc35c6745ae files/digest-lilo-22.5.9-r2 124
 MD5 77acd52c9bdf0a660026777a3419ccb3 files/lilo-22.5.9-glibc233.patch 584
 MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.5.9-create-install-dirs.patch 970
 MD5 2419c22323e1cfdbbc1ca149cb05e74d files/lilo-22.5.8-create-install-dirs.patch 970
-MD5 4f45300f3c2dca6a14ae1d0c5d669d15 files/lilo.conf 1718
+MD5 90ff63638cb8b46b9e6f3c5231bd464e files/lilo.conf 1719
 MD5 348f7a96783361cf8f0a0703bfeaa03a files/lilo-22.5.9-lvm.2-6headers.patch 470
 MD5 fdc2575e3b1e96d80ba2c1409abcad0e files/lilo-22.5.9-devmapper_gentoo.patch 11884
 MD5 348f7a96783361cf8f0a0703bfeaa03a files/lilo-22.5.8.lvm.2-6headers.patch 470
diff --git a/sys-boot/lilo/files/digest-lilo-22.5.9-r1 b/sys-boot/lilo/files/digest-lilo-22.5.9-r2
index f9cdd0591159..e0d3ab92e91c 100644
--- a/sys-boot/lilo/files/digest-lilo-22.5.9-r1
+++ b/sys-boot/lilo/files/digest-lilo-22.5.9-r2
@@ -1,2 +1,2 @@
 MD5 d5b561190cbe0968d50e09e0031edb79 lilo-22.5.9.tar.gz 415378
-MD5 fc344efe42e541a11a0972fa418780ce dolilo-0.1.tar.bz2 3930
+MD5 62a7ebbbf998d84e06a3f18569567a9e dolilo-0.2.tar.bz2 4263
diff --git a/sys-boot/lilo/lilo-22.5.9-r1.ebuild b/sys-boot/lilo/lilo-22.5.9-r2.ebuild
index 0e0ae947817c..3b729fde6c61 100644
--- a/sys-boot/lilo/lilo-22.5.9-r1.ebuild
+++ b/sys-boot/lilo/lilo-22.5.9-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.9-r1.ebuild,v 1.4 2004/07/03 18:58:35 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/lilo/lilo-22.5.9-r2.ebuild,v 1.1 2004/07/11 15:41:22 chainsaw Exp $
 
 inherit eutils flag-o-matic
 
-DOLILO_V="0.1"
+DOLILO_V="0.2"
 IUSE="devmap static"
 
 DESCRIPTION="Standard Linux boot loader"
@@ -61,6 +61,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-create-install-dirs.patch
 	# Correctly document commandline options -v and -V, bug #43554
 	epatch ${FILESDIR}/${P}-correct-usage-info.patch
+	# Get the manpage path right
 	sed -i -e s,usr/man,usr/share/man,g ${S}/Makefile
 }
 
@@ -190,9 +191,8 @@ pkg_postinst() {
 	einfo "Please note that all the loader files (/boot/*.b) are now linked"
 	einfo "into LILO, and thus no longer installed."
 	einfo "Issue 'dolilo' instead of 'lilo' to have a friendly wrapper that"
-	einfo "handles mounting and unmounting /boot for you, and automatically"
-	einfo "copies the newest available bzImage in place."
-	einfo "Edit /etc/conf.d/dolilo to harness it's full potential."
+	einfo "handles mounting and unmounting /boot for you. It can do more then"
+	einfo "that when asked, edit /etc/conf.d/dolilo to harness it's full potential."
 	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
 	sleep 3
 	echo