diff options
| author | ru <ru@FreeBSD.org> | 2005-11-27 23:17:00 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2005-11-27 23:17:00 +0000 |
| commit | 9fa3a162bcf8544009ef55b3e84fb3e19396c953 (patch) | |
| tree | a8f69b1f507a116aae9c4e4acdd1eb1f1271bb93 /usr.sbin/config | |
| parent | 0b4ce8e3e1cb11709c2122272d006774ad389a59 (diff) | |
| download | FreeBSD-src-9fa3a162bcf8544009ef55b3e84fb3e19396c953.zip FreeBSD-src-9fa3a162bcf8544009ef55b3e84fb3e19396c953.tar.gz | |
- Allow duplicate "machine" directives with the same arguments.
- Move existing "machine" directives to DEFAULTS.
Diffstat (limited to 'usr.sbin/config')
| -rw-r--r-- | usr.sbin/config/config.y | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y index e8c53d5..168f4f8 100644 --- a/usr.sbin/config/config.y +++ b/usr.sbin/config/config.y @@ -136,7 +136,7 @@ Spec: Config_spec: ARCH Save_id = { - if (machinename != NULL) + if (machinename != NULL && !eq($2, machinename)) errx(1, "%s:%d: only one machine directive is allowed", yyfile, yyline); machinename = $2; @@ -144,7 +144,8 @@ Config_spec: } | ARCH Save_id Save_id = { - if (machinename != NULL) + if (machinename != NULL && + !(eq($2, machinename) && eq($3, machinearch))) errx(1, "%s:%d: only one machine directive is allowed", yyfile, yyline); machinename = $2; |
