diff options
| author | eivind <eivind@FreeBSD.org> | 1998-04-02 04:25:41 +0000 |
|---|---|---|
| committer | eivind <eivind@FreeBSD.org> | 1998-04-02 04:25:41 +0000 |
| commit | 9f3f2581d72c97064d2a1db80850ec557b91f2ca (patch) | |
| tree | 7586c6fcf8f05a5bcface7daf8d883cce96c1811 /usr.sbin/config | |
| parent | 136b08f78c72a7fa0d8d3b846ec6fb28a261917a (diff) | |
| download | FreeBSD-src-9f3f2581d72c97064d2a1db80850ec557b91f2ca.zip FreeBSD-src-9f3f2581d72c97064d2a1db80850ec557b91f2ca.tar.gz | |
Scaffolding for High Availability code. The actual code will probably
come tomorrow.
Submitted by: Simon Shapiro <shimon@simon-shapiro.org>
Diffstat (limited to 'usr.sbin/config')
| -rw-r--r-- | usr.sbin/config/config.y | 3 | ||||
| -rw-r--r-- | usr.sbin/config/lang.l | 1 | ||||
| -rw-r--r-- | usr.sbin/config/mkglue.c | 3 | ||||
| -rw-r--r-- | usr.sbin/config/mkioconf.c | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y index 6a46c58..f437b26 100644 --- a/usr.sbin/config/config.y +++ b/usr.sbin/config/config.y @@ -12,6 +12,7 @@ %token BIO %token BUS %token CAM +%token HA %token COMMA %token CONFIG %token CONFLICTS @@ -631,6 +632,8 @@ Info: = { cur.d_mask = "bio"; } | CAM = { cur.d_mask = "cam"; } | + HA + = { cur.d_mask = "ha"; } | NET = { cur.d_mask = "net"; } | FLAGS NUMBER diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l index 5e0cd21..aaefd51 100644 --- a/usr.sbin/config/lang.l +++ b/usr.sbin/config/lang.l @@ -56,6 +56,7 @@ struct kt { { "bio", BIO }, { "bus", BUS }, { "cam", CAM}, + { "ha", HA}, { "conflicts", CONFLICTS }, #endif { "config", CONFIG }, diff --git a/usr.sbin/config/mkglue.c b/usr.sbin/config/mkglue.c index bbf0da0..9bfae60 100644 --- a/usr.sbin/config/mkglue.c +++ b/usr.sbin/config/mkglue.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mkglue.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id: mkglue.c,v 1.12 1997/09/15 06:37:08 charnier Exp $"; + "$Id: mkglue.c,v 1.13 1997/09/21 22:12:49 gibbs Exp $"; #endif /* not lint */ /* @@ -384,6 +384,7 @@ vector() vector_devtab(fp, "tty", &dev_id); vector_devtab(fp, "net", &dev_id); vector_devtab(fp, "cam", &dev_id); + vector_devtab(fp, "ha", &dev_id); vector_devtab(fp, "null", &dev_id); fprintf(fp, "\"\n\n"); fprintf(fp, "#define\tNR_DEVICES\t%d\n", dev_id); diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c index 425e66c..817350e 100644 --- a/usr.sbin/config/mkioconf.c +++ b/usr.sbin/config/mkioconf.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mkioconf.c 8.2 (Berkeley) 1/21/94"; #endif static const char rcsid[] = - "$Id: mkioconf.c,v 1.32 1997/09/17 06:20:44 charnier Exp $"; + "$Id: mkioconf.c,v 1.33 1997/09/21 22:12:50 gibbs Exp $"; #endif /* not lint */ #include <err.h> @@ -699,6 +699,7 @@ i386_ioconf() isa_devtab(fp, "tty", &dev_id); isa_devtab(fp, "net", &dev_id); isa_devtab(fp, "cam", &dev_id); + isa_devtab(fp, "ha", &dev_id); isa_devtab(fp, "null", &dev_id); } if (seen_scbus) |
