From: Chris Gianelloni Date: Wed, 15 Feb 2006 03:53:55 +0000 (+0000) Subject: Fixed creation of kernelpkgs.txt for the Installer. X-Git-Tag: CATALYST_2_0_6_916~403 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9f9edce3405e54a4fe1f5ad710cc284032648ca;p=catalyst.git Fixed creation of kernelpkgs.txt for the Installer. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1091 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 680c0700..5c033c4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.576 2006/02/14 19:49:49 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.577 2006/02/15 03:53:54 wolf31o2 Exp $ + + 15 Feb 2006; Chris Gianelloni + targets/support/kmerge.sh: + Fixed creation of kernelpkgs.txt for the Installer. 14 Feb 2006; Chris Gianelloni livecd/cdtar/elilo-3.4-cdtar.tar.bz2: diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 0e6e45bf..f18bf4b9 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -62,7 +62,8 @@ genkernel_compile(){ export clst_kernel_merge export clst_initramfs_overlay # Build our list of kernel packages - if [ "${clst_livecd_type}" = "gentoo-release-livecd" -a "$clst_kernel_merge" != ""] + if [ "${clst_livecd_type}" = "gentoo-release-livecd" ] \ + && [ "$clst_kernel_merge" != ""] then mkdir -p /usr/livecd echo "${clst_kernel_merge}" > /usr/livecd/kernelpkgs.txt