diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2016-09-18 15:23:43 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2016-09-18 15:23:43 +0000 |
| commit | ebe614d4ec539ca16f4f7e739e1a78c61edd070f (patch) | |
| tree | f7065ed6468c23c9cfd66ae12a20c0f74bfe8bf1 | |
| parent | e52040f93798267a8110083127b32896f8960650 (diff) | |
Switch the i386 floppy ramdisk to fdboot(8), now that it works correctly.
This will avoid overflow caused by upcoming changes to boot(8).
ok deraadt@
| -rw-r--r-- | distrib/i386/common/Makefile.inc | 4 | ||||
| -rw-r--r-- | distrib/i386/ramdisk/Makefile | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc index f518adf212c..8a611ed6453 100644 --- a/distrib/i386/common/Makefile.inc +++ b/distrib/i386/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.37 2014/03/29 17:32:41 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.38 2016/09/18 15:23:42 jsing Exp $ TOP= ${.CURDIR}/.. @@ -20,7 +20,7 @@ VND_RDEV= /dev/r${VND}a VND_CRDEV= /dev/r${VND}c PID!= echo $$$$ REALIMAGE!= echo /var/tmp/image.${PID} -BOOT= ${DESTDIR}/usr/mdec/boot +BOOT?= ${DESTDIR}/usr/mdec/boot FLOPPYSIZE?= 2880 FLOPPYTYPE?= floppy3 diff --git a/distrib/i386/ramdisk/Makefile b/distrib/i386/ramdisk/Makefile index 8c91aa8c126..6ff26e62f05 100644 --- a/distrib/i386/ramdisk/Makefile +++ b/distrib/i386/ramdisk/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2015/01/12 17:10:37 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2016/09/18 15:23:42 jsing Exp $ .PATH: ${.CURDIR}/../ramdiskA +BOOT= ${DESTDIR}/usr/mdec/fdboot RAMDISK=RAMDISK NOBSDRD=1 |