broken make-live

[xamiw at arcor.de (Goran)]

Hi all!

As I started to build a DebianLive-cd I got two errors which I fixed
with steps stated below.

[Error 1]
description:
make-live can't find include-files which contains several functions.

fix:
I changed the lines 39-42 in /usr/sbnim/make-live into a dirty hack:

	for SCRIPT in `ls ${BASE}/scripts`; do
		. "${BASE}/scripts/${SCRIPT}"
	done


[Error 2]
description:
21image.sh wants to copy XOR move the file
"${LIVE_CHROOT}"/boot/initrd.img-* to
"${LIVE_ROOT}"/binary/isolinux/initrd.gz BUT there exists two files
which are meet by initrd.img-* (initrd.img-2.6.18-3-486.bak and
initrd.img-2.6.18-3-486.bak). So make-live (in fact cp XOR mv) must
break.

fix:
I changed the lines 221-229  in /usr/share/make-live/scripts/21image.sh
into a dirty hack:

	if [ "${LIVE_FLAVOUR}" = "minimal" ]; then
		mv "${LIVE_CHROOT}"/boot/vmlinuz-*\
		"${LIVE_ROOT}"/binary/isolinux/vmlinuz

		# attend to "486"
		mv "${LIVE_CHROOT}"/boot/initrd.img-*486\
		"${LIVE_ROOT}"/binary/isolinux/initrd.gz

		rm -f "${LIVE_CHROOT}"/vmlinuz\
		"${LIVE_CHROOT}"/initrd.img
	else
		cp "${LIVE_CHROOT}"/boot/vmlinuz-*\
		"${LIVE_ROOT}"/binary/isolinux/vmlinuz

		# attend to "486"
		cp "${LIVE_CHROOT}"/boot/initrd.img-*486\
		"${LIVE_ROOT}"/binary/isolinux/initrd.gz
	fi

After these dirty steps make-live works for me.

Thanks for this fine software...

Goran Vukoman