From 895b7b154341a0a0ccd046c3bd18e2c5c9a45578 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Sun, 23 Apr 2006 02:58:37 +0000 Subject: [PATCH] Fixed creation of kernelpkgs.txt file for the installer. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1122 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- targets/support/kmerge.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0325de50..1da31484 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.607 2006/04/21 13:00:50 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.608 2006/04/23 02:58:37 wolf31o2 Exp $ + + 23 Apr 2006; Chris Gianelloni + targets/support/kmerge.sh: + Fixed creation of kernelpkgs.txt file for the installer. 21 Apr 2006; Chris Gianelloni modules/generic_stage_target.py: diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 31d72361..f308d6cc 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -63,7 +63,7 @@ genkernel_compile(){ export clst_initramfs_overlay # Build our list of kernel packages if [ "${clst_livecd_type}" = "gentoo-release-livecd" ] \ - && [ "$clst_kernel_merge" != ""] + && [ -n "${clst_kernel_merge}" ] then mkdir -p /usr/livecd echo "${clst_kernel_merge}" > /usr/livecd/kernelpkgs.txt -- 2.26.2