Date: Thu, 15 Apr 1999 07:52:25 -0700 (PDT) From: Bruce Evans <bde@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/usr.sbin/config config.y configvers.h mkswapconf.c src/sys/i386/conf Makefile.i386 files.i386 src/sys/i386/i386 autoconf.c swapgeneric.c Message-ID: <199904151452.HAA44087@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
bde 1999/04/15 07:52:24 PDT
Modified files:
usr.sbin/config config.y configvers.h mkswapconf.c
sys/i386/conf Makefile.i386 files.i386
sys/i386/i386 autoconf.c swapgeneric.c
Log:
Made booting with -a work for all configurations. Previously it
only worked for configurations with "swap on generic".
usr.sbin/config/config.y:
- ignore all "swap [on] device ...' specifications except for
warning about them. They haven't done anything related to swap
for almost 4 years, and were previously silently ignored,
except for "swap on generic" which stopped swap${KERNEL}.c
from being generated. Code to support swapping is now deader
than before.
usr.sbin/config/mkswapconf.c:
- don't generate a dummy setconf() function in swap${KERNEL}.c.
sys/i386/conf/files.i386:
- swapgeneric.c is now standard. It should be merged into autoconf.c
so that it doesn't conflict with swap${KERNEL}.c for kernels named
"generic".
sys/i386/i386/autoconf.c:
- don't call setroot() for mfs roots. Since setroot() doesn't do anything
harmful, this was just a waste of time, except possibly for booting with
-a it may have helped prevent an undesireable call to setconf() by
finding a bogus rootdev.
- honor -a for ffs roots. -a now overrides all other ways of specifying
the root device. Previously, -r had precedence over -a, and the -a
handling was usually a no-op.
- don't honor -a for non-ffs roots, since it would currently just get in
the way of a clean panic.
sys/i386/i386/swapgeneric.c:
- don't declare things that are now always declared in swap${KERNEL}.c.
Don't decide things that are now decided in autoconf.c. Code to
support the "generic" case is now dead instead of useless.
Revision Changes Path
1.26 +1 -1 src/usr.sbin/config/config.y
1.11 +2 -2 src/usr.sbin/config/configvers.h
1.16 +1 -3 src/usr.sbin/config/mkswapconf.c
1.145 +2 -2 src/sys/i386/conf/Makefile.i386
1.235 +2 -1 src/sys/i386/conf/files.i386
1.112 +6 -24 src/sys/i386/i386/autoconf.c
1.27 +1 -5 src/sys/i386/i386/swapgeneric.c
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199904151452.HAA44087>