Attachment #2464 for bug #14712

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




#!/bin/ash -efu

. "${0%/*}"/mki-sh-functions

verbose "has started executing."

[ -d "$chroot" ] ||
	fatal "$dir: not look like a work directory of hasher."

mki-install syslinux ||
	fatal "faild to install 'syslinux'."

[ -f "$chroot/.image/syslinux/syslinux.cfg" ] ||
	message 'Warning: /.image/syslinux/syslinux.cfg: not found.'

cat >"$chroot/tmp/packimage.sh"<<EOF
#!/bin/sh -efu
mkdir -p -- /.image/syslinux/alt0
cp -aLf /boot/vmlinuz /.image/syslinux/alt0/vmlinuz
EOF

mki_exec_once "$chroot/tmp/packimage.sh"

Lines 12-18 Link Here

(-)mkimage.orig/tools/mki-pack-boot (-1 / +1 lines)
12	types=	12	types=
13	for b in ${BOOT_TYPE:-}; do	13	for b in ${BOOT_TYPE:-}; do
14	case "$b" in	14	case "$b" in
15	isolinux\|pxelinux) types="$types $b " ;;	15	isolinux\|pxelinux\|syslinux) types="$types $b " ;;
16	*) fatal "Unknown boot type" ;;	16	*) fatal "Unknown boot type" ;;
17	esac	17	esac
18	done	18	done

Lines 4-9 Link Here

(-)mkimage.orig/tools/mki-pack-data (-1 / +4 lines)
4		4
5	imgsubdir="${MKI_IMAGESUBDIR:-}"	5	imgsubdir="${MKI_IMAGESUBDIR:-}"
6	imgsubdir="${imgsubdir#/}"	6	imgsubdir="${imgsubdir#/}"
		7	outname="${MKI_OUTNAME:-}"
		8	outname="${outname##*/}"
7		9
8	[ -d "$chroot" ] \|\|	10	[ -d "$chroot" ] \|\|
9	fatal "$dir: not look like a work directory of hasher."	11	fatal "$dir: not look like a work directory of hasher."
Lines 15-21 Link Here
15	imgdir="/.image/$imgsubdir"	17	imgdir="/.image/$imgsubdir"
16	cd /.our	18	cd /.our
17	/.host/find -mindepth 1 -maxdepth 1 -exec rm -rf -- '{}' '+'	19	/.host/find -mindepth 1 -maxdepth 1 -exec rm -rf -- '{}' '+'
18	/.host/find "\$imgdir/" -mindepth 1 -maxdepth 1 -exec cp -alt /.our/ -- '{}' '+'	20	[ -n "$outname" -a ! -d "$outname" ] && mkdir -p "$outname"
		21	/.host/find "\$imgdir/" -mindepth 1 -maxdepth 1 -exec cp -alt /.our/$outname -- '{}' '+'
19	EOF	22	EOF
20		23
21	mki_exec_once "$chroot/tmp/packimage.sh"	24	mki_exec_once "$chroot/tmp/packimage.sh"

Return to bug 14712

Line 0 Link Here

(-)mkimage.orig/tools/mki-copy-syslinux (+22 lines)
	1	#!/bin/ash -efu
	2
	3	. "${0%/*}"/mki-sh-functions
	4
	5	verbose "has started executing."
	6
	7	[ -d "$chroot" ] \|\|
	8	fatal "$dir: not look like a work directory of hasher."
	9
	10	mki-install syslinux \|\|
	11	fatal "faild to install 'syslinux'."
	12
	13	[ -f "$chroot/.image/syslinux/syslinux.cfg" ] \|\|
	14	message 'Warning: /.image/syslinux/syslinux.cfg: not found.'
	15
	16	cat >"$chroot/tmp/packimage.sh"<<EOF
	17	#!/bin/sh -efu
	18	mkdir -p -- /.image/syslinux/alt0
	19	cp -aLf /boot/vmlinuz /.image/syslinux/alt0/vmlinuz
	20	EOF
	21
	22	mki_exec_once "$chroot/tmp/packimage.sh"