Attachment 2464 Details for Bug 14712 – обработка BOOT_TYPE=syslinux

[patch] обработка BOOT_TYPE=syslinux

mkimage-syslinux.patch (text/plain), 1.93 KB, created by Michael A. Kangin on 2008-02-29 20:59:42 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Michael A. Kangin

Created: 2008-02-29 20:59:42 MSK

Size: 1.93 KB

patch

obsolete

>diff -urN mkimage.orig/tools/mki-copy-syslinux mkimage/tools/mki-copy-syslinux
>--- mkimage.orig/tools/mki-copy-syslinux	1970-01-01 03:00:00 +0300
>+++ mkimage/tools/mki-copy-syslinux	2008-02-29 19:05:39 +0300
>@@ -0,0 +1,22 @@
>+#!/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"
>diff -urN mkimage.orig/tools/mki-pack-boot mkimage/tools/mki-pack-boot
>--- mkimage.orig/tools/mki-pack-boot	2008-02-24 13:44:05 +0300
>+++ mkimage/tools/mki-pack-boot	2008-02-29 20:25:30 +0300
>@@ -12,7 +12,7 @@
> types=
> for b in ${BOOT_TYPE:-}; do
> 	case "$b" in
>-		isolinux|pxelinux) types="$types $b " ;;
>+		isolinux|pxelinux|syslinux) types="$types $b " ;;
> 		*) fatal "Unknown boot type" ;;
> 	esac
> done
>diff -urN mkimage.orig/tools/mki-pack-data mkimage/tools/mki-pack-data
>--- mkimage.orig/tools/mki-pack-data	2008-02-24 13:44:05 +0300
>+++ mkimage/tools/mki-pack-data	2008-02-29 18:20:53 +0300
>@@ -4,6 +4,8 @@
> 
> imgsubdir="${MKI_IMAGESUBDIR:-}"
> imgsubdir="${imgsubdir#/}"
>+outname="${MKI_OUTNAME:-}"
>+outname="${outname##*/}"
> 
> [ -d "$chroot" ] ||
> 	fatal "$dir: not look like a work directory of hasher."
>@@ -15,7 +17,8 @@
> 	imgdir="/.image/$imgsubdir"
> cd /.our
> /.host/find -mindepth 1 -maxdepth 1 -exec rm -rf -- '{}' '+'
>-/.host/find "\$imgdir/" -mindepth 1 -maxdepth 1 -exec cp -alt /.our/ -- '{}' '+'
>+[ -n "$outname" -a ! -d "$outname" ] && mkdir -p "$outname"
>+/.host/find "\$imgdir/" -mindepth 1 -maxdepth 1 -exec cp -alt /.our/$outname -- '{}' '+'
> EOF
> 
> mki_exec_once "$chroot/tmp/packimage.sh"

Actions: View | Diff

Attachments on bug 14712: 2464