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

diff --git a/ChangeLog b/ChangeLog
index 0325de50c7dabcfcc994376921a52296c7d969ea..1da31484c3285574a68929fb547ccc230a2cc91f 100644 (file)
--- 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 <wolf31o2@gentoo.org>
+  targets/support/kmerge.sh:
+  Fixed creation of kernelpkgs.txt file for the installer.
 
   21 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 31d72361a846c9e86c8c0f0585393f50ff9d37cc..f308d6ccc36a5ddb1e53fda82a4e4dd72ebdb5be 100755 (executable)
--- 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