diff -ur catalyst2.orig/targets/embedded/embedded-controller.sh catalyst2/targets/embedded/embedded-controller.sh
--- catalyst2.orig/targets/embedded/embedded-controller.sh	2006-01-05 21:11:00.000000000 +0100
+++ catalyst2/targets/embedded/embedded-controller.sh	2006-01-10 18:34:17.000000000 +0100
@@ -44,9 +44,9 @@
 		shift
 		export clst_kname="$1"
 		# if we have our own linuxrc, copy it in
-		if [ -n "${clst_linuxrc}" ]
+		if [ -n "${clst_livecd_linuxrc}" ]
 		then
-			cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
+			cp -pPR ${clst_livecd_linuxrc} ${clst_chroot_path}/tmp/linuxrc
 		fi
 		exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
 		delete_from_chroot tmp/linuxrc
diff -ur catalyst2.orig/targets/livecd-stage2/livecd-stage2-controller.sh catalyst2/targets/livecd-stage2/livecd-stage2-controller.sh
--- catalyst2.orig/targets/livecd-stage2/livecd-stage2-controller.sh	2006-01-05 21:11:00.000000000 +0100
+++ catalyst2/targets/livecd-stage2/livecd-stage2-controller.sh	2006-01-10 18:35:32.000000000 +0100
@@ -19,9 +19,9 @@
 		export clst_kname="$1"
 
 		# if we have our own linuxrc, copy it in
-		if [ -n "${clst_linuxrc}" ]
+		if [ -n "${clst_livecd_linuxrc}" ]
 		then
-			cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
+			cp -pPR ${clst_livecd_linuxrc} ${clst_chroot_path}/tmp/linuxrc
 		fi
 		exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
 		delete_from_chroot tmp/linuxrc
diff -ur catalyst2.orig/targets/stage4/stage4-controller.sh catalyst2/targets/stage4/stage4-controller.sh
--- catalyst2.orig/targets/stage4/stage4-controller.sh	2006-01-05 21:11:00.000000000 +0100
+++ catalyst2/targets/stage4/stage4-controller.sh	2006-01-10 18:35:15.000000000 +0100
@@ -23,9 +23,9 @@
 		shift
 		export clst_kname="$1"
 		# If we have our own linuxrc, copy it in
-		if [ -n "${clst_linuxrc}" ]
+		if [ -n "${clst_livecd_linuxrc}" ]
 		then
-			cp -a ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
+			cp -a ${clst_livecd_linuxrc} ${clst_chroot_path}/tmp/linuxrc
 		fi
 		exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
 		delete_from_chroot tmp/linuxrc
diff -ur catalyst2.orig/targets/support/kmerge.sh catalyst2/targets/support/kmerge.sh
--- catalyst2.orig/targets/support/kmerge.sh	2006-01-05 21:11:00.000000000 +0100
+++ catalyst2/targets/support/kmerge.sh	2006-01-10 18:34:31.000000000 +0100
@@ -44,7 +44,7 @@
 		GK_ARGS="${GK_ARGS} --no-udev"
 	fi
 
-	if [ -n "${clst_linuxrc}" ]
+	if [ -n "${clst_livecd_linuxrc}" ]
 	then
 		GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc"
 	fi