From 010c9d8df7555a37e38488e52a980d3388191096 Mon Sep 17 00:00:00 2001 From: Donny Davies Date: Mon, 30 Sep 2002 00:55:18 +0000 Subject: close #7898, #8057, #7903 --- sys-apps/lilo/ChangeLog | 18 +++++++----------- sys-apps/lilo/files/lilo.conf | 3 +++ sys-apps/lilo/lilo-22.3.3-r1.ebuild | 24 +++++++++++++++--------- 3 files changed, 25 insertions(+), 20 deletions(-) (limited to 'sys-apps/lilo') diff --git a/sys-apps/lilo/ChangeLog b/sys-apps/lilo/ChangeLog index 074992b9bd17..d9e305bd1ae6 100644 --- a/sys-apps/lilo/ChangeLog +++ b/sys-apps/lilo/ChangeLog @@ -1,13 +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.11 2002/09/22 21:48:31 woodchip Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/ChangeLog,v 1.12 2002/09/30 00:55:18 woodchip Exp $ *lilo-22.3.3-r1 (22 Sep 2002) + 29 Sep 2002; Donny Davies : + Several fixes + cosmetic issues. #7898, #8057, #7903. + 22 Sep 2002; Donny Davies : - Now using mount-boot.eclass. Added more docs, added the samples, - added the mkrescue and activate programs. Created new patch for - boot animations; http://www.gamers.org/~quinet/lilo/index.html. + Now uses mount-boot.eclass. Created new patch a la Suse. *lilo-22.3.3 (3 Sep 2002) @@ -26,19 +27,15 @@ 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. +*lilo-22.1-r3 (5 Apr 2002) + 14 Jul 2002; phoen][x lilo-22.1-r3.ebuild : Added LICENSE, KEYWORDS, SLOT. Removed the stale ebuilds. -*lilo-22.1-r3 (5 Apr 2002) - 5 Apr 2002; M.Schlemmer lilo-22.1-r3.ebuild : Fix the /boot issue finally (hopefully :P). Add $ROOT checking afterwards. - 18 Feb 2002; Donny Davies lilo-21.7.5-r1.ebuild : - ATTN Maintainers: This lilo has the patches from SuSe for animated boot - logos. - *lilo-22.1-r2 (4 Feb 2002) 4 Feb 2002; G.Bevin lilo-22.1-r2.ebuild : @@ -50,7 +47,6 @@ 2 Feb 2002; Donny Davies lilo-22.1-r1.ebuild: 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/lilo.conf b/sys-apps/lilo/files/lilo.conf index d843e7d5c097..1b0d24e4c7d5 100644 --- a/sys-apps/lilo/files/lilo.conf +++ b/sys-apps/lilo/files/lilo.conf @@ -1,3 +1,4 @@ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/files/lilo.conf,v 1.3 2002/09/30 00:55:18 woodchip Exp $ # Author: Ultanium # Start LILO global section menu-scheme=Wb @@ -9,6 +10,8 @@ map = /boot/System.map lba32 #if lba32 do not work, use linear #linear +#if you always want to see the prompt with a 15 second timeout: +#timeout=150 delay = 50 vga = normal # Normal VGA console # End LILO global section diff --git a/sys-apps/lilo/lilo-22.3.3-r1.ebuild b/sys-apps/lilo/lilo-22.3.3-r1.ebuild index 65d7628ddad3..5afe8c434dd5 100644 --- a/sys-apps/lilo/lilo-22.3.3-r1.ebuild +++ b/sys-apps/lilo/lilo-22.3.3-r1.ebuild @@ -1,12 +1,12 @@ # 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/lilo/lilo-22.3.3-r1.ebuild,v 1.1 2002/09/22 21:48:31 woodchip Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lilo/lilo-22.3.3-r1.ebuild,v 1.2 2002/09/30 00:55:18 woodchip Exp $ inherit mount-boot S=${WORKDIR}/${P} DESCRIPTION="Standard Linux boot loader" -SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/${P}.tar.gz +SRC_URI="http://home.san.rr.com/johninsd/pub/linux/lilo/${P}.tar.gz mirror://gentoo/${P}-gentoo.diff.bz2" HOMEPAGE="http://brun.dyndns.org/pub/linux/lilo/" DEPEND="virtual/glibc dev-lang/nasm >=sys-devel/bin86-0.15.5" @@ -45,26 +45,32 @@ src_install() { pkg_preinst() { if [ ! -L $ROOT/boot/boot.b -a -f $ROOT/boot/boot.b ] then - einfo "Saving old boot.b..." - mv $ROOT/boot/boot.b $ROOT/boot/boot.old + einfo "Saving old boot.b..." + mv -f $ROOT/boot/boot.b $ROOT/boot/boot.old fi if [ ! -L $ROOT/boot/chain.b -a -f $ROOT/boot/chain.b ] then - einfo "Saving old chain.b..." - mv $ROOT/boot/chain.b $ROOT/boot/chain.old + einfo "Saving old chain.b..." + mv -f $ROOT/boot/chain.b $ROOT/boot/chain.old + fi + + if [ ! -L ${ROOT}/boot/mbr.b -a -f ${ROOT}/boot/mbr.b ] + then + einfo "Saving old mbr.b..." + mv -f ${ROOT}/boot/mbr.b ${ROOT}/boot/mbr.old fi if [ ! -L $ROOT/boot/os2_d.b -a -f $ROOT/boot/os2_d.b ] then - einfo "Saving old os2_d.b..." - mv $ROOT/boot/os2_d.b $ROOT/boot/os2_d.old + einfo "Saving old os2_d.b..." + mv -f $ROOT/boot/os2_d.b $ROOT/boot/os2_d.old fi } pkg_postinst() { einfo "Activating boot-menu..." - ln -sf boot-menu.b $ROOT/boot/boot.b + ln -snf boot-menu.b $ROOT/boot/boot.b einfo einfo "You can get some animations at:" -- cgit v1.2.3-65-gdbad