X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=programs%2Fmkwinpeimg.in;h=654249b24cf73f9c459145c87671caee9dceaff0;hb=56f881eba91349abe40dd250ecbf08310cb88ce8;hp=5316efa8f79fa44ba31a047ca6c0c5b763588643;hpb=9655f89082b186f7748485c6ee42c878274fdb25;p=wimlib

diff --git a/programs/mkwinpeimg.in b/programs/mkwinpeimg.in
index 5316efa8..654249b2 100755
--- a/programs/mkwinpeimg.in
+++ b/programs/mkwinpeimg.in
@@ -116,7 +116,7 @@ EOF
 }
 
 version() {
-	echo "$script_name (wimlib $WIMLIB_VERSION)"
+	echo "$script_name (distributed with wimlib $WIMLIB_VERSION)"
 	exit 0
 }
 
@@ -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