set maxpartitions to machine default.

fix shift/reduce conflicts in grammar (i'm ukrainian, not else ;)

diff --git a/usr.sbin/config/gram.y b/usr.sbin/config/gram.y
index ab1c8eb..2d98f23 100644 (file)
--- a/usr.sbin/config/gram.y
+++ b/usr.sbin/config/gram.y
@@ -1,5 +1,5 @@
 %{
-/*     $OpenBSD: gram.y,v 1.4 1996/07/07 22:02:20 maja Exp $   */
+/*     $OpenBSD: gram.y,v 1.5 1996/09/12 07:51:17 mickey Exp $ */
 /*     $NetBSD: gram.y,v 1.7 1996/03/17 13:18:18 cgd Exp $     */
 
 /*
@@ -127,6 +127,9 @@ static      void    setmaxpartitions __P((int));
 %type  <val>   major_minor signed_number npseudo
 %type  <val>   flags_opt
 
+%left  '|'
+%left  '&'
+
 %%
 
 /*

diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c
index 82b73f0..bbe2794 100644 (file)
--- a/usr.sbin/config/main.c
+++ b/usr.sbin/config/main.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: main.c,v 1.5 1996/08/29 03:33:06 deraadt Exp $        */
+/*     $OpenBSD: main.c,v 1.6 1996/09/12 07:51:17 mickey Exp $ */
 /*     $NetBSD: main.c,v 1.17 1996/03/17 11:50:13 cgd Exp $    */
 
 /*
@@ -59,6 +59,7 @@ static char copyright[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <machine/disklabel.h>
 #include "config.h"
 
 int    firstfile __P((const char *));
@@ -145,6 +146,7 @@ usage:
         */
        minmaxusers = 1;
        maxmaxusers = 10000;
+       maxpartitions = MAXPARTITIONS;
        initintern();
        initfiles();
        initsem();