Module Name: src
Committed By: snj
Date: Thu Jul 30 15:40:14 UTC 2015
Modified Files:
src/distrib/common/bootimage [netbsd-7]: Makefile.bootimage
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #902):
distrib/common/bootimage/Makefile.bootimage: revision 1.11
Fix ytpo: INSTALLBOOTOPTIONS, not INSTALLBOOTOPTOINS.
>From qjsgkem on Freenode.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.2.1 src/distrib/common/bootimage/Makefile.bootimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.9 src/distrib/common/bootimage/Makefile.bootimage:1.9.2.1
--- src/distrib/common/bootimage/Makefile.bootimage:1.9 Tue Aug 5 15:40:58 2014
+++ src/distrib/common/bootimage/Makefile.bootimage Thu Jul 30 15:40:14 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.9 2014/08/05 15:40:58 apb Exp $
+# $NetBSD: Makefile.bootimage,v 1.9.2.1 2015/07/30 15:40:14 snj Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -381,7 +381,7 @@ ${IMGBASE}.img: ${TARGETFS} ${WORKLABEL}
.endif
${TOOL_DISKLABEL} -R -F ${WORKIMG} ${WORKLABEL}
.if !empty(PRIMARY_BOOT) && ${INSTALLBOOT_AFTER_DISKLABEL} != "no"
- ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${INSTALLBOOTOPTOINS} ${WORKIMG} \
+ ${TOOL_INSTALLBOOT} -v -m ${MACHINE} ${INSTALLBOOTOPTIONS} ${WORKIMG} \
${WORKDIR}/usr/mdec/${PRIMARY_BOOT}
.endif
mv ${WORKIMG} ${.TARGET}
