avoid dcdb warnings when creating a new cluster

diff --git a/Makefile b/Makefile
index 9a03ed7ad344dc65cb893f2fb41e0e8615879998..0634ed2f1c42a8d9ab34adaedee88525d1dbd526 100644 (file)
--- 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 7d430361b6fbf04aa489272a376ec8ba9751a44d..349bc2f7d93f9440258b873b9d8c720cc236b41d 100644 (file)
--- 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 0a8b1c9803c61a18f465c9d389f9a835a9e77ab1..7fce915ac229caa8e7a43be9a57489857b982816 100644 (file)
--- 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