diff options
| author | peter <peter@FreeBSD.org> | 1999-01-07 06:52:41 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-01-07 06:52:41 +0000 |
| commit | ea7fa796872cd5bf550f062e35482087cd6b9e1c (patch) | |
| tree | 54649e93bf8c4b24b3f65ed7a28c2e78b31618ef /sys/conf | |
| parent | 7109145cbdd4f112d8d6c4772184fbfeeee0e905 (diff) | |
| download | FreeBSD-src-ea7fa796872cd5bf550f062e35482087cd6b9e1c.zip FreeBSD-src-ea7fa796872cd5bf550f062e35482087cd6b9e1c.tar.gz | |
Flip the kernel default to ELF.. Add a test to try and warn people
that they might be about to blow their feet off if they have not been
reading their mail. I don't know if or how well this will work, but it's
worth a try.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/Makefile.i386 | 14 | ||||
| -rw-r--r-- | sys/conf/Makefile.powerpc | 14 |
2 files changed, 24 insertions, 4 deletions
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index c48432f..1905403 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.131 1998/12/20 16:25:21 bde Exp $ +# $Id: Makefile.i386,v 1.132 1998/12/21 10:29:09 msmith Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ # Which version of config(8) is required. %VERSREQ= 300009 -KERNFORMAT?= aout +KERNFORMAT?= elf STD8X16FONT?= iso @@ -211,6 +211,16 @@ install: echo "You must first build your kernel before trying to install." ; \ exit 1 ; \ fi +.if ${KERNFORMAT} == "elf" && !defined(FORCE) + @if [ -f /kernel -a "`file /kernel 2>/dev/null | grep ELF`" = "" ]; then \ + echo "WARNING: You are about to install an ELF kernel for the first time!" ; \ + echo "Please be sure you have upgraded your bootblocks and/or /boot/loader so" ; \ + echo "that you can boot it. Old bootblocks WILL NOT WORK! Please read:" ; \ + echo "http://www.freebsd.org/~peter/elfday.html for information." ; \ + echo "If you are satisfied you can boot an ELF kernel, type: make -DFORCE install" ; \ + exit 1 ; \ + fi +.endif .if exists(${DESTDIR}/kernel) chflags noschg ${DESTDIR}/kernel mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index c48432f..1905403 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.131 1998/12/20 16:25:21 bde Exp $ +# $Id: Makefile.i386,v 1.132 1998/12/21 10:29:09 msmith Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ # Which version of config(8) is required. %VERSREQ= 300009 -KERNFORMAT?= aout +KERNFORMAT?= elf STD8X16FONT?= iso @@ -211,6 +211,16 @@ install: echo "You must first build your kernel before trying to install." ; \ exit 1 ; \ fi +.if ${KERNFORMAT} == "elf" && !defined(FORCE) + @if [ -f /kernel -a "`file /kernel 2>/dev/null | grep ELF`" = "" ]; then \ + echo "WARNING: You are about to install an ELF kernel for the first time!" ; \ + echo "Please be sure you have upgraded your bootblocks and/or /boot/loader so" ; \ + echo "that you can boot it. Old bootblocks WILL NOT WORK! Please read:" ; \ + echo "http://www.freebsd.org/~peter/elfday.html for information." ; \ + echo "If you are satisfied you can boot an ELF kernel, type: make -DFORCE install" ; \ + exit 1 ; \ + fi +.endif .if exists(${DESTDIR}/kernel) chflags noschg ${DESTDIR}/kernel mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old |
