CVS commit: src/distrib/amd64/floppies/common
Module Name:src
Committed By: jym
Date: Tue Feb 8 12:25:36 UTC 2011
Modified Files:
src/distrib/amd64/floppies/common: Makefile.bootfloppy
Log Message:
FLOPPYPAD + ${MACHINE} instead of hardcoding amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/distrib/amd64/floppies/common/Makefile.bootfloppy
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/floppies/common/Makefile.bootfloppy
diff -u src/distrib/amd64/floppies/common/Makefile.bootfloppy:1.10 src/distrib/amd64/floppies/common/Makefile.bootfloppy:1.11
--- src/distrib/amd64/floppies/common/Makefile.bootfloppy:1.10 Tue Nov 4 23:02:52 2008
+++ src/distrib/amd64/floppies/common/Makefile.bootfloppy Tue Feb 8 12:25:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootfloppy,v 1.10 2008/11/04 23:02:52 dbj Exp $
+# $NetBSD: Makefile.bootfloppy,v 1.11 2011/02/08 12:25:36 jym Exp $
#
# Makefile snippet to create a set of USTAR floppies
#
@@ -31,9 +31,10 @@
FLOPPYKERNOBJ!= cd ${.CURDIR}/../../${FLOPPYKERNDIR} ${PRINTOBJDIR}
FLOPPY_BOOT?= ${MDEC}/boot
-FLOPPY_BOOT_CFG?= ${DISTRIBDIR}/amd64/floppies/common/boot.cfg
+FLOPPY_BOOT_CFG?= ${DISTRIBDIR}/${MACHINE}/floppies/common/boot.cfg
FLOPPY_NETBSD= ${FLOPPYKERNOBJ}/${FLOPPYKERNEL}
FLOPPYFILES= boot boot.cfg ${FLOPPYMETAFILE} netbsd
+FLOPPYPAD= 1
FLOPPY_RELEASEDIR= installation/floppy
CVS commit: src/distrib/amd64/floppies/common
Module Name:src Committed By: njoly Date: Wed Sep 23 11:17:59 UTC 2009 Modified Files: src/distrib/amd64/floppies/common: boot.cfg Log Message: Update boot.cfg banner/menu to reflect that installation floppies have ACPI support. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/amd64/floppies/common/boot.cfg Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/amd64/floppies/common/boot.cfg diff -u src/distrib/amd64/floppies/common/boot.cfg:1.2 src/distrib/amd64/floppies/common/boot.cfg:1.3 --- src/distrib/amd64/floppies/common/boot.cfg:1.2 Sun Mar 8 05:39:19 2009 +++ src/distrib/amd64/floppies/common/boot.cfg Wed Sep 23 11:17:58 2009 @@ -1,11 +1,11 @@ banner=NetBSD floppy diskette installation banner banner= -banner=These diskettes do not have support for ACPI and may not work on some -banner=modern hardware. If the floppy disk installation does not work, please -banner=try installing using a CD-ROM image. +banner=ACPI should work on all modern and legacy hardware, however if you have +banner=problems, please try disabling it. banner= menu=Install NetBSD:boot netbsd -menu=Install NetBSD (no SMP):boot netbsd -12 +menu=Install NetBSD (no ACPI):boot netbsd -2 +menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12 menu=Drop to boot prompt:prompt timeout=10
