diff options
| author | will <will@FreeBSD.org> | 2015-01-23 16:03:02 +0000 |
|---|---|---|
| committer | will <will@FreeBSD.org> | 2015-01-23 16:03:02 +0000 |
| commit | 341f4a2128ad20f79cce8f6c69287feb07257642 (patch) | |
| tree | b211baf73776d1e47a677fe700fbeb06aebd5cac /usr.sbin/config/config.y | |
| parent | fd94a9f5f8bf599226a25b08fba05b191f8ab292 (diff) | |
| download | FreeBSD-src-341f4a2128ad20f79cce8f6c69287feb07257642.zip FreeBSD-src-341f4a2128ad20f79cce8f6c69287feb07257642.tar.gz | |
Allow lists for "nooption" and "nooptions" keywords.
usr.sbin/config/config.y
According to config(5), the "device", "devices",
"nodevice", "nodevices", "option", "options",
"nooption", and "nooptions" keywords can all take a
comma-separated list of values. However, the yacc code
did not allow lists for "nooption" and "nooptions", only
single values. This commit fixes the yacc code to allow
comma separated values for all the above keywords.
Submitted by: asomers
MFC after: 1 week
Sponsored by: Spectra Logic
MFSpectraBSD: 1095296 on 2014/10/07
Diffstat (limited to 'usr.sbin/config/config.y')
| -rw-r--r-- | usr.sbin/config/config.y | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y index 81329d9..c7198a0 100644 --- a/usr.sbin/config/config.y +++ b/usr.sbin/config/config.y @@ -178,7 +178,7 @@ Config_spec: } | OPTIONS Opt_list | - NOOPTION Save_id { rmopt_schedule(&opt, $2); } | + NOOPTION NoOpt_list | MAKEOPTIONS Mkopt_list | NOMAKEOPTION Save_id { rmopt_schedule(&mkopt, $2); } | @@ -225,6 +225,11 @@ Opt_list: Option ; +NoOpt_list: + NoOpt_list COMMA NoOption + | + NoOption + ; Option: Save_id { newopt(&opt, $1, NULL, 0); @@ -236,6 +241,11 @@ Option: newopt(&opt, $1, $3, 0); } ; +NoOption: + Save_id { + rmopt_schedule(&opt, $1); + }; + Opt_value: ID { $$ = $1; } | NUMBER { |
