All volume IDs use a dash and now I can't unsee it missing.
OK?
Index: alpha/miniroot/Makefile
===================================================================
RCS file: /cvs/src/distrib/alpha/miniroot/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- alpha/miniroot/Makefile 26 Jul 2021 12:47:44 -0000 1.23
+++ alpha/miniroot/Makefile 4 Nov 2021 18:45:35 -0000
@@ -46,7 +46,7 @@ ${CDROM}: bsd.gz
cp ${DESTDIR}/usr/mdec/bootxx ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
(mkhybrid -a -R -T -L -d -D -N -o ${.OBJDIR}/${CDROM} -v -v -v \
- -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
+ -A "OpenBSD ${OSREV} ${MACHINE} boot-only CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <[email protected]>" \
-V "OpenBSD/${MACHINE} ${OSREV} boot-only CD" \
Index: amd64/ramdisk_cd/Makefile
===================================================================
RCS file: /cvs/src/distrib/amd64/ramdisk_cd/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- amd64/ramdisk_cd/Makefile 26 Jul 2021 12:47:45 -0000 1.31
+++ amd64/ramdisk_cd/Makefile 4 Nov 2021 18:42:51 -0000
@@ -45,7 +45,7 @@ ${CDROM}: bsd.rd
cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp ${DESTDIR}/usr/mdec/cdboot
${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \
- -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
+ -A "OpenBSD ${OSREV} ${MACHINE} boot-only CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <[email protected]>" \
-V "OpenBSD/${MACHINE} ${OSREV} boot-only CD" \
Index: hppa/ramdisk/Makefile
===================================================================
RCS file: /cvs/src/distrib/hppa/ramdisk/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- hppa/ramdisk/Makefile 26 Jul 2021 12:47:45 -0000 1.48
+++ hppa/ramdisk/Makefile 4 Nov 2021 18:45:35 -0000
@@ -20,7 +20,7 @@ ${CDROM}: bsd.rd
rm -rf ${.OBJDIR}/cd-dir/
mkdir -p ${.OBJDIR}/cd-dir/
cp bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
- mkhybrid -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
+ mkhybrid -A "OpenBSD ${OSREV} ${MACHINE} boot-only CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <[email protected]>" \
-V "OpenBSD/${MACHINE} ${OSREV} boot-only CD" \
Index: i386/ramdisk_cd/Makefile
===================================================================
RCS file: /cvs/src/distrib/i386/ramdisk_cd/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- i386/ramdisk_cd/Makefile 4 Oct 2021 17:02:21 -0000 1.26
+++ i386/ramdisk_cd/Makefile 4 Nov 2021 18:45:35 -0000
@@ -42,7 +42,7 @@ ${CDROM}: bsd.rd
cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp ${DESTDIR}/usr/mdec/cdboot
${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \
- -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
+ -A "OpenBSD ${OSREV} ${MACHINE} boot-only CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <[email protected]>" \
-V "OpenBSD/${MACHINE} ${OSREV} boot-only CD" \
Index: loongson/ramdisk/Makefile
===================================================================
RCS file: /cvs/src/distrib/loongson/ramdisk/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- loongson/ramdisk/Makefile 26 Jul 2021 12:47:46 -0000 1.31
+++ loongson/ramdisk/Makefile 4 Nov 2021 18:45:35 -0000
@@ -38,7 +38,7 @@ ${CDROM}: bsd.rd
echo "set image /${OSREV}/${MACHINE}/bsd.rd" >
${.OBJDIR}/cd-dir/etc/boot.conf
cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \
- -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
+ -A "OpenBSD ${OSREV} ${MACHINE} boot-only CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <[email protected]>" \
-V "OpenBSD/${MACHINE} ${OSREV} boot CD" \
Index: macppc/ramdisk/Makefile
===================================================================
RCS file: /cvs/src/distrib/macppc/ramdisk/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- macppc/ramdisk/Makefile 26 Jul 2021 12:47:46 -0000 1.51
+++ macppc/ramdisk/Makefile 4 Nov 2021 18:45:35 -0000
@@ -22,7 +22,7 @@ ${CDROM}: bsd.gz
mkhybrid -r -part -hfs \
-hfs-bless ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} \
-map ${.CURDIR}/../../../gnu/usr.sbin/mkhybrid/src/more.mapping \
- -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
+ -A "OpenBSD ${OSREV} ${MACHINE} boot-only CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <[email protected]>" \
-V "OpenBSD/${MACHINE} ${OSREV} boot-only CD" \
Index: sparc64/miniroot/Makefile
===================================================================
RCS file: /cvs/src/distrib/sparc64/miniroot/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- sparc64/miniroot/Makefile 26 Jul 2021 12:47:47 -0000 1.28
+++ sparc64/miniroot/Makefile 4 Nov 2021 18:45:35 -0000
@@ -47,7 +47,7 @@ ${CDROM}: bsd.rd ${FS}
echo 'm 5 sun4us' >> ${.OBJDIR}/cd-dir/.slicemapfile
echo 'm 6 sun4v' >> ${.OBJDIR}/cd-dir/.slicemapfile
mkhybrid -a -R -r -T -L -d -D -N \
- -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
+ -A "OpenBSD ${OSREV} ${MACHINE} boot-only CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
-p "Theo de Raadt <[email protected]>" \
-V "OpenBSD/${MACHINE} ${OSREV} boot-only CD" \
