From 9fa3a162bcf8544009ef55b3e84fb3e19396c953 Mon Sep 17 00:00:00 2001 From: ru Date: Sun, 27 Nov 2005 23:17:00 +0000 Subject: - Allow duplicate "machine" directives with the same arguments. - Move existing "machine" directives to DEFAULTS. --- usr.sbin/config/config.y | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr.sbin/config') 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; -- cgit v1.1