From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Mon, 17 Apr 2006 21:31:56 +0000 (+0000)
Subject: Fixed genkernel initramfs overlay support.  Thanks to Alvin Lee <liyiming@ict.ac... 
X-Git-Tag: CATALYST_2_0_6_916~383
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2e84a6c9e25936797bac45371c470b6abc6a94b6;p=catalyst.git

Fixed genkernel initramfs overlay support.  Thanks to Alvin Lee <liyiming@ict.ac.cn> in bug #129890.


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1111 d1e1f19c-881f-0410-ab34-b69fee027534
---

diff --git a/ChangeLog b/ChangeLog
index 03f62767..57efc565 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.596 2006/04/17 19:01:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.597 2006/04/17 21:31:56 wolf31o2 Exp $
+
+  17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/kmerge.sh:
+  Fixed genkernel initramfs overlay support. Thanks to Alvin Lee
+  <liyiming@ict.ac.cn> in bug #129890.
 
   17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index f18bf4b9..31d72361 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -32,7 +32,7 @@ setup_gk_args() {
 		GK_ARGS="${GK_ARGS} --gensplash=${clst_splash_theme}"
 	fi
 
-	if [ -d "${clst_initramfs_overlay}" ]
+	if [ -d "/tmp/initramfs_overlay/${clst_initramfs_overlay}" ]
 	then
 		GK_ARGS="${GK_ARGS} --initramfs-overlay=/tmp/initramfs_overlay/${clst_initramfs_overlay}"
 	fi