[DRBD-cvs] user by phil; Changed the config keywords minor_count ...

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Wed, 30 Jun 2004 13:44:07 +0200 (CEST)


DRBD CVS committal

Author  : phil
Project : drbd
Module  : user

Dir     : drbd/user


Modified Files:
      Tag: rel-0_7-branch
	drbdadm_main.c drbdadm_scanner.fl 


Log Message:
Changed the config keywords minor_count -> minor-count and
disable_io_hints -> disable-io-hints.

[the old syntax is still valid]

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm_main.c,v
retrieving revision 1.1.2.53
retrieving revision 1.1.2.54
diff -u -3 -r1.1.2.53 -r1.1.2.54
--- drbdadm_main.c	3 Jun 2004 11:11:57 -0000	1.1.2.53
+++ drbdadm_main.c	30 Jun 2004 11:44:01 -0000	1.1.2.54
@@ -179,9 +179,9 @@
     {
       printI("global {\n"); ++indent;
       if (global_options.disable_io_hints)
-	printI("disable_io_hints;\n");
+	printI("disable-io-hints;\n");
       if (global_options.minor_count)
-	printI("minor_count = %i;\n", global_options.minor_count);
+	printI("minor-count %i;\n", global_options.minor_count);
       --indent; printI("}\n\n");
     }
 }
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm_scanner.fl,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -3 -r1.1.2.22 -r1.1.2.23
--- drbdadm_scanner.fl	9 Jun 2004 20:06:36 -0000	1.1.2.22
+++ drbdadm_scanner.fl	30 Jun 2004 11:44:01 -0000	1.1.2.23
@@ -189,9 +189,11 @@
 }
 
 <GLOBAL>{
-  minor_count		do_assign(NUM); CP; return TK_MINOR_COUNT;
+  minor_count		do_assign(NUM); return TK_MINOR_COUNT;
+  minor-count		do_assign(NUM); return TK_MINOR_COUNT;
   disable_io_hints	yy_push_state(SEMICOLON); return TK_DISABLE_IO_HINTS;
-  {NDELIM}		expect_error("'minor_count|disable_io_hints'");
+  disable-io-hints	yy_push_state(SEMICOLON); return TK_DISABLE_IO_HINTS;
+  {NDELIM}		expect_error("'minor-count|disable-io-hints'");
 }
 
 <RESOURCE>{