From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 31 Dec 2013 19:36:39 +0000 (-0600)
Subject: mkwinpeimg: Make compatible with Syslinux version 6
X-Git-Tag: v1.6.0~40
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=3dadfb7cb8722d1b8320defeac26e1bc4f074fd4

mkwinpeimg: Make compatible with Syslinux version 6
---

diff --git a/programs/mkwinpeimg.in b/programs/mkwinpeimg.in
index 5316efa8..42b4a1c5 100755
--- a/programs/mkwinpeimg.in
+++ b/programs/mkwinpeimg.in
@@ -473,11 +473,26 @@ make_disk_img() {
 
 	export MTOOLSRC="$mtool_conf"
 
-	mformat -h 255 -s 63 -T $(( image_size / 512)) s:
-	mcopy -s "$tmp_dir"/* s:
+	mformat -h 255 -s 63 -T $(( image_size / 512)) s: || stat_fail
+	mcopy -s "$tmp_dir"/* s: || stat_fail
 
 	syslinux --install "$image"
-	mcopy /usr/lib/syslinux/chain.c32 s:
+
+	syslinuxdir="/usr/lib/syslinux"
+
+	if [ -d "$syslinuxdir/bios" ]; then
+		biosdir="$syslinuxdir/bios"
+	else
+		biosdir="$syslinuxdir"
+	fi
+
+	mcopy "$biosdir/chain.c32" s: || stat_fail
+	if [ -e "$biosdir/libcom32.c32" ]; then
+		mcopy "$biosdir/libcom32.c32" s:
+	fi
+	if [ -e "$biosdir/libutil.c32" ]; then
+		mcopy "$biosdir/libutil.c32" s:
+	fi
 	mcopy - 's:syslinux.cfg' <<- EOF
 		DEFAULT winpe
 		LABEL	winpe