Attachment #76756 for bug #118542

View | Details | Raw Unified | Return to bug 118542
Collapse All | Expand All

Lines 44-52 Link Here

(-)catalyst2.orig/targets/embedded/embedded-controller.sh (-2 / +2 lines)
44	shift	44	shift
45	export clst_kname="$1"	45	export clst_kname="$1"
46	# if we have our own linuxrc, copy it in	46	# if we have our own linuxrc, copy it in
47	if [ -n "${clst_linuxrc}" ]	47	if [ -n "${clst_livecd_linuxrc}" ]
48	then	48	then
49	cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc	49	cp -pPR ${clst_livecd_linuxrc} ${clst_chroot_path}/tmp/linuxrc
50	fi	50	fi
51	exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh	51	exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
52	delete_from_chroot tmp/linuxrc	52	delete_from_chroot tmp/linuxrc

Lines 19-27 Link Here

(-)catalyst2.orig/targets/livecd-stage2/livecd-stage2-controller.sh (-2 / +2 lines)
19	export clst_kname="$1"	19	export clst_kname="$1"
20		20
21	# if we have our own linuxrc, copy it in	21	# if we have our own linuxrc, copy it in
22	if [ -n "${clst_linuxrc}" ]	22	if [ -n "${clst_livecd_linuxrc}" ]
23	then	23	then
24	cp -pPR ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc	24	cp -pPR ${clst_livecd_linuxrc} ${clst_chroot_path}/tmp/linuxrc
25	fi	25	fi
26	exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh	26	exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
27	delete_from_chroot tmp/linuxrc	27	delete_from_chroot tmp/linuxrc

Lines 23-31 Link Here

(-)catalyst2.orig/targets/stage4/stage4-controller.sh (-2 / +2 lines)
23	shift	23	shift
24	export clst_kname="$1"	24	export clst_kname="$1"
25	# If we have our own linuxrc, copy it in	25	# If we have our own linuxrc, copy it in
26	if [ -n "${clst_linuxrc}" ]	26	if [ -n "${clst_livecd_linuxrc}" ]
27	then	27	then
28	cp -a ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc	28	cp -a ${clst_livecd_linuxrc} ${clst_chroot_path}/tmp/linuxrc
29	fi	29	fi
30	exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh	30	exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh
31	delete_from_chroot tmp/linuxrc	31	delete_from_chroot tmp/linuxrc

Lines 44-50 Link Here

(-)catalyst2.orig/targets/support/kmerge.sh (-1 / +1 lines)
44	GK_ARGS="${GK_ARGS} --no-udev"	44	GK_ARGS="${GK_ARGS} --no-udev"
45	fi	45	fi
46		46
47	if [ -n "${clst_linuxrc}" ]	47	if [ -n "${clst_livecd_linuxrc}" ]
48	then	48	then
49	GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc"	49	GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc"
50	fi	50	fi

Return to bug 118542