... but keep the previous logic for sparc, which is the other user of this
authormiod <miod@openbsd.org>
Tue, 20 Oct 2015 16:22:47 +0000 (16:22 +0000)
committermiod <miod@openbsd.org>
Tue, 20 Oct 2015 16:22:47 +0000 (16:22 +0000)
Makefile, until it switches to MI installboot, too.

distrib/ramdisk/Makefile

index 618df43..5029115 100644 (file)
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.44 2015/10/20 16:18:23 miod Exp $
+#      $OpenBSD: Makefile,v 1.45 2015/10/20 16:22:47 miod Exp $
 
 REV=           ${OSrev}
 
@@ -62,8 +62,16 @@ ${FLOPPY}:   bsd.gz ${BOOT} ${BOOTXX}
        disklabel -w ${VND} ${FLOPPYTYPE}
        newfs ${NEWFSOPTS_FD} ${VND_RDEV}
        mount ${VND_DEV} ${MOUNT_POINT}
+.if ${MACHINE} == "sparc"
+       cp ${BOOT} ${MOUNT_POINT}/
+.endif
        cp bsd.gz ${MOUNT_POINT}/bsd
+.if ${MACHINE} == "sparc"
+       ${INSTALLBOOT} -v ${BOOTIN} ${BOOTXX} \
+           `echo ${VND_RDEV} | sed -e 's/a$$/c/'`
+.else
        ${INSTALLBOOT} -v -r ${MOUNT_POINT} ${VND} ${BOOTXX} ${BOOT}
+.endif
        @echo ""
        @df -i ${MOUNT_POINT}
        @echo ""