diff options
author | peter <peter@FreeBSD.org> | 1999-05-10 02:42:58 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-05-10 02:42:58 +0000 |
commit | e3eacaf57f57205efd0026d52fb555333f487ac5 (patch) | |
tree | 5176595f4373c834eb6ef6911e129a1dcec1b5b0 /usr.sbin/config | |
parent | e38e2b0426674f858e2b1edfbeb39f36a13fe4da (diff) | |
download | FreeBSD-src-e3eacaf57f57205efd0026d52fb555333f487ac5.zip FreeBSD-src-e3eacaf57f57205efd0026d52fb555333f487ac5.tar.gz |
Understand 'config kernelname' and pretend it was a
'makeoptions KERNEL=kernelname'. Warn about any trailing stuff as it's
not handled here. This is a simple bandaid, hopefully to head off some
complaints from certain people.
Diffstat (limited to 'usr.sbin/config')
-rw-r--r-- | usr.sbin/config/config.y | 28 | ||||
-rw-r--r-- | usr.sbin/config/lang.l | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y index 1ff9c00..37cc9df 100644 --- a/usr.sbin/config/config.y +++ b/usr.sbin/config/config.y @@ -11,6 +11,7 @@ %token BUS %token CAM %token COMMA +%token CONFIG %token CONFLICTS %token CONTROLLER %token CPU @@ -175,9 +176,36 @@ Config_spec: | IDENT ID = { ident = $2; } | + System_spec + | MAXUSERS NUMBER = { maxusers = $2; }; +System_spec: + CONFIG System_id System_parameter_list + = { warnx("line %d: root/dump/swap specifications obsolete", yyline);} + | + CONFIG System_id + ; + +System_id: + Save_id + = { + struct opt *op = (struct opt *)malloc(sizeof (struct opt)); + memset(op, 0, sizeof(*op)); + op->op_name = ns("KERNEL"); + op->op_ownfile = 0; + op->op_next = mkopt; + op->op_value = $1; + op->op_line = yyline + 1; + mkopt = op; + }; + +System_parameter_list: + System_parameter_list ID + | ID + ; + device_name: Save_id = { $$ = $1; } diff --git a/usr.sbin/config/lang.l b/usr.sbin/config/lang.l index f1061f6..4368695 100644 --- a/usr.sbin/config/lang.l +++ b/usr.sbin/config/lang.l @@ -57,6 +57,7 @@ struct kt { { "bus", BUS }, { "cam", CAM }, /* XXX going away */ { "conflicts", CONFLICTS }, + { "config", CONFIG }, { "controller", CONTROLLER }, { "cpu", CPU }, { "device", DEVICE }, |