[DRBD-cvs] svn commit by phil - r2215 - trunk/user - A last small fix to make drbdadm adjust work with exter

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-05-24 21:04:01 +0200 (Wed, 24 May 2006)
New Revision: 2215

Modified:
   trunk/user/drbdadm_parser.c
   trunk/user/drbdadm_parser.h
Log:
A last small fix to make drbdadm adjust work with external meta data.


Modified: trunk/user/drbdadm_parser.c
===================================================================
--- trunk/user/drbdadm_parser.c	2006-05-24 18:42:52 UTC (rev 2214)
+++ trunk/user/drbdadm_parser.c	2006-05-24 19:04:01 UTC (rev 2215)
@@ -354,8 +354,6 @@
 				EXP(TK_INTEGER);
 				host->meta_index = yylval.txt;
 				EXP(']');
-				EXP(';');
-			} else {
 				switch(yylex()) {
 				case TK__MAJOR:
 					EXP(TK_INTEGER);
@@ -369,6 +367,8 @@
 				default:
 					pe_expected("_major | ;");
 				}
+			} else {
+				EXP(';');
 			}
 			check_meta_disk(host);
 			break;

Modified: trunk/user/drbdadm_parser.h
===================================================================
--- trunk/user/drbdadm_parser.h	2006-05-24 18:42:52 UTC (rev 2214)
+++ trunk/user/drbdadm_parser.h	2006-05-24 19:04:01 UTC (rev 2215)
@@ -80,7 +80,7 @@
 	TK_STARTUP_SWITCH,
 	TK_STARTUP_OPTION,
 	TK_HANDLER_OPTION,
-	TK_USAGE_COUNT,
+	TK_USAGE_COUNT,  // 290
 	TK_ASK,
 	TK_YES,
 	TK_NO,