git: ace42fe8afaf - stable/12 - Avoid using non-portable dd conv=osync option

The branch stable/12 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=ace42fe8afaf1f988c871775509463bb48c52f6d

commit ace42fe8afaf1f988c871775509463bb48c52f6d
Author:     Alex Richardson <arichardson@FreeBSD.org>
AuthorDate: 2020-05-11 08:40:33 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2021-10-08 02:42:42 +0000

    Avoid using non-portable dd conv=osync option
    
    The same thing can be achieved using the bs=$SIZE and conv=sync options.
    Unlike conv=osync, conv=sync is support on both Linux and macOS.
    
    (cherry picked from commit 87c5e64c64e43be532cb703e96c0776309aab337)
---
 stand/i386/boot2/Makefile   | 2 +-
 stand/i386/pxeldr/Makefile  | 2 +-
 stand/i386/zfsboot/Makefile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/stand/i386/boot2/Makefile b/stand/i386/boot2/Makefile
index 3830199b2c4b..9bb31275b9c6 100644
--- a/stand/i386/boot2/Makefile
+++ b/stand/i386/boot2/Makefile
@@ -66,7 +66,7 @@ BOOT2SIZE=	7680
 boot2: boot2.ld
 	@set -- `ls -l ${.ALLSRC}`; x=$$((${BOOT2SIZE}-$$5)); \
 	    echo "$$x bytes available"; test $$x -ge 0
-	${DD} if=${.ALLSRC} of=${.TARGET} obs=${BOOT2SIZE} conv=osync
+	${DD} if=${.ALLSRC} of=${.TARGET} bs=${BOOT2SIZE} conv=sync
 
 boot2.ld: boot2.ldr boot2.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \
diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile
index e1bcccc69112..2184d391937f 100644
--- a/stand/i386/pxeldr/Makefile
+++ b/stand/i386/pxeldr/Makefile
@@ -31,7 +31,7 @@ CLEANFILES+= ${BOOT}.tmp
 
 ${BOOT}: ${LDR} ${LOADER}
 	cat ${LDR} ${LOADER} > ${.TARGET}.tmp
-	${DD} if=${.TARGET}.tmp of=${.TARGET} obs=2k conv=osync
+	${DD} if=${.TARGET}.tmp of=${.TARGET} bs=2048 conv=sync
 	rm ${.TARGET}.tmp
 
 LDFLAGS+=${LDFLAGS_BIN}
diff --git a/stand/i386/zfsboot/Makefile b/stand/i386/zfsboot/Makefile
index 422bce0e5b88..80303cb8fde0 100644
--- a/stand/i386/zfsboot/Makefile
+++ b/stand/i386/zfsboot/Makefile
@@ -62,7 +62,7 @@ BOOT2SIZE=	262144
 zfsboot2: zfsboot.ld
 	@set -- `ls -l ${.ALLSRC}`; x=$$((${BOOT2SIZE}-$$5)); \
 	    echo "$$x bytes available"; test $$x -ge 0
-	${DD} if=${.ALLSRC} of=${.TARGET} obs=${BOOT2SIZE} conv=osync
+	${DD} if=${.ALLSRC} of=${.TARGET} bs=${BOOT2SIZE} conv=sync
 
 zfsboot.ld: zfsboot.ldr zfsboot.bin ${BTXKERN}
 	btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l zfsboot.ldr \