From owner-cvs-usrsbin Sat Feb 18 10:05:40 1995 Return-Path: cvs-usrsbin-owner Received: (from root@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id KAA22810 for cvs-usrsbin-outgoing; Sat, 18 Feb 1995 10:05:40 -0800 Received: (from wpaul@localhost) by freefall.cdrom.com (8.6.9/8.6.6) id KAA22800; Sat, 18 Feb 1995 10:05:38 -0800 Date: Sat, 18 Feb 1995 10:05:38 -0800 From: Bill Paul Message-Id: <199502181805.KAA22800@freefall.cdrom.com> To: CVS-commiters, cvs-usrsbin Subject: cvs commit: src/usr.sbin/config mkswapconf.c Sender: cvs-usrsbin-owner@freebsd.org Precedence: bulk wpaul 95/02/18 10:05:37 Modified: usr.sbin/config mkswapconf.c Log: Do away with 'options SWAP_GENERIC' once and for all: I get ill just thinking about it. Two changes need to be made to allow 'config kernel swap generic' to work properly without requiring any compile-time flags: /usr/src/usr.sbin/config/mkswapconf.c: we need to define a dummy stub for the setconf() function to replace the one in swapgeneric.c that isn't available in non-generic configurations. /usr/src/sys/i386/i386/autoconf.c: the -a boot flag causes setroot() to be skipped and lets setconf() prompt the user for a root device. If you skip setroot() in a non-generic kernel, you could get severely hosed. To avoid this, we silently ignore the -a flag if rootdev != NODEV. (rootdev is always initialized to NODEV in swapgeneric.c, so if we find that rootdev is something other than NODEV, we know we're not using a generic configuration.)