From: Dietmar Maurer <dietmar@proxmox.com>
Date: Tue, 20 Mar 2012 06:52:40 +0000 (+0100)
Subject: avoid dcdb warnings when creating a new cluster
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=f6efd6bf4f4b07ecb5db76b1c274330630861d99;p=pve-cluster.git

avoid dcdb warnings when creating a new cluster
---

diff --git a/Makefile b/Makefile
index 9a03ed7..0634ed2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 PACKAGE=pve-cluster
 PKGVER=1.0
-PKGREL=23
+PKGREL=24
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
diff --git a/data/src/dcdb.c b/data/src/dcdb.c
index 7d43036..349bc2f 100644
--- a/data/src/dcdb.c
+++ b/data/src/dcdb.c
@@ -374,8 +374,10 @@ dcdb_sync_cluster_conf(
 
 	GError *err = NULL;
 	if (!g_file_get_contents(HOST_CLUSTER_CONF_FN, &old_data, &old_length, &err)) {
-		cfs_critical("unable to read cluster config file '%s' - %s", 
-			   HOST_CLUSTER_CONF_FN, err->message);
+		if (!g_error_matches(err, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
+			cfs_critical("unable to read cluster config file '%s' - %s", 
+				     HOST_CLUSTER_CONF_FN, err->message);
+		}
 		g_error_free (err);
 	} else {
 		if (old_length)
@@ -397,7 +399,7 @@ dcdb_sync_cluster_conf(
 
 	cfs_message("wrote new cluster config '%s'", HOST_CLUSTER_CONF_FN);
 
-	if (notify_cman) {
+	if (notify_cman && old_version) {
 		/* tell cman that there is a new config file */
 		cfs_debug ("run cman_tool version");
 		int status = system("/usr/sbin/cman_tool version -r -S >/dev/null 2>&1");
diff --git a/debian/changelog b/debian/changelog
index 0a8b1c9..7fce915 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-cluster (1.0-24) unstable; urgency=low
+
+  * avoid dcdb warnings when creating a new cluster
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 20 Mar 2012 07:51:27 +0100
+
 pve-cluster (1.0-23) unstable; urgency=low
 
   * fix for pvecm add: avoid ambiguous options