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.

3 files changed, 4 insertions, 6 deletions

diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index 04757a9..1ac9308 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -248,6 +248,7 @@ addr_spec:
 
 swap_spec:
 	  SWAP optional_on swap_device_list
+		= { yyerror("swap specification obsolete, ignored"); }
 	;
 	
 swap_device_list:
@@ -257,7 +258,6 @@ swap_device_list:
 	
 swap_device:
 	  swap_device_spec optional_size optional_sflag
-	      = { mkswap(*confp, $1, $2, $3); }
 	;
 
 swap_device_spec:
diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h
index 292d60c..ff49b5b 100644
--- a/usr.sbin/config/configvers.h
+++ b/usr.sbin/config/configvers.h
@@ -6,6 +6,6 @@
  * The numbering scheme is inspired by the sys/conf/newvers.sh RELDATE
  * and <osreldate.h> system.
  *
- * $Id: configvers.h,v 1.9 1999/04/07 09:42:29 grog Exp $
+ * $Id: configvers.h,v 1.10 1999/04/13 18:22:57 peter Exp $
  */
-#define	CONFIGVERS	300011
+#define	CONFIGVERS	300012
diff --git a/usr.sbin/config/mkswapconf.c b/usr.sbin/config/mkswapconf.c
index d276099..6ad8a19 100644
--- a/usr.sbin/config/mkswapconf.c
+++ b/usr.sbin/config/mkswapconf.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkswapconf.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: mkswapconf.c,v 1.14 1997/09/17 06:20:45 charnier Exp $";
+	"$Id: mkswapconf.c,v 1.15 1998/06/09 14:02:08 dfr Exp $";
 #endif /* not lint */
 
 /*
@@ -118,8 +118,6 @@ do_swap(fl)
 	} else {
 		fprintf(fp, "dev_t\tdumpdev = NODEV;\t\t\t/* unconfigured */\n");
 	}
-	fprintf(fp, "\n");
-	fprintf(fp, "void\nsetconf()\n{\n}\n");
 	fclose(fp);
 	moveifchanged(path(newswapname), path(swapname));
 	return (swap);