[DRBD-cvs] svn commit by phil - r2366 - trunk/user - Fixed some of the anoing bugs in the userlans stuff.

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-08-11 13:52:20 +0200 (Fri, 11 Aug 2006)
New Revision: 2366

Modified:
   trunk/user/drbdadm_parser.c
   trunk/user/drbdadm_usage_cnt.c
   trunk/user/drbdmeta.c
Log:
Fixed some of the anoing bugs in the userlans stuff.


Modified: trunk/user/drbdadm_parser.c
===================================================================
--- trunk/user/drbdadm_parser.c	2006-08-11 08:34:22 UTC (rev 2365)
+++ trunk/user/drbdadm_parser.c	2006-08-11 11:52:20 UTC (rev 2366)
@@ -229,8 +229,8 @@
 	}
 	fprintf(stderr, "%s:%u: Parse error: '%s' expected,\n\t"
 		"but got '%s' (TK %d)\n",
-		config_file, line,
-		"but got '%s' (TK %d)\n", config_file, line, exp, yytext, got);
+		config_file, line, 
+		tmp[0] ? tmp : exp, yytext, got);
 	exit(E_config_invalid);
 }
 

Modified: trunk/user/drbdadm_usage_cnt.c
===================================================================
--- trunk/user/drbdadm_usage_cnt.c	2006-08-11 08:34:22 UTC (rev 2365)
+++ trunk/user/drbdadm_usage_cnt.c	2006-08-11 11:52:20 UTC (rev 2366)
@@ -455,6 +455,8 @@
 
 	rv = _admm_generic(res, cmd, SLEEPS_VERY_LONG); // cmd is "create-md".
 
+	if(rv || dry_run) return rv;
+
 	fd = open(res->me->disk,O_RDONLY);
 	if( fd != -1) {
 		device_size = bdev_size(fd);

Modified: trunk/user/drbdmeta.c
===================================================================
--- trunk/user/drbdmeta.c	2006-08-11 08:34:22 UTC (rev 2365)
+++ trunk/user/drbdmeta.c	2006-08-11 11:52:20 UTC (rev 2366)
@@ -2120,7 +2120,7 @@
 	if (!virgin) {
 		if (!confirmed("Valid meta-data already in place, recreate new?")) {
 			printf("Operation cancelled.\n");
-			exit(0);
+			exit(1); // 1 to avoid online resource counting
 		}
 	} else {
 		printf("About to create a new drbd meta data block\non %s.\n",
@@ -2130,7 +2130,7 @@
 		if (!confirmed(" ==> This might destroy existing data! <==\n\n"
 				"Do you want to proceed?")) {
 			printf("Operation cancelled.\n");
-			exit(0);
+			exit(1); // 1 to avoid online resource counting
 		}
 	}