diff options
| author |   miod <miod@openbsd.org> | 2015-10-20 16:22:47 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2015-10-20 16:22:47 +0000 |
| commit | e43d4df22a6ec2905a96a396d4ec27e8aabfb073 (patch) | |
| tree | 1d4e1e6ce7476ea286ecc77594a4c88c81efaf38 | |
| parent | Missing commit of vax switch to MI installboot(8), forgotten when it went in. (diff) | |
| download | wireguard-openbsd-e43d4df22a6ec2905a96a396d4ec27e8aabfb073.tar.xz wireguard-openbsd-e43d4df22a6ec2905a96a396d4ec27e8aabfb073.zip | |
... but keep the previous logic for sparc, which is the other user of this
Makefile, until it switches to MI installboot, too.
| -rw-r--r-- | distrib/ramdisk/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile index 618df4339bb..5029115fd78 100644 --- a/distrib/ramdisk/Makefile +++ b/distrib/ramdisk/Makefile @@ -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 "" |