From: Jan Safranek <jsafrane@redhat.com>
Date: Wed, 10 Nov 2010 15:09:55 +0000 (+0100)
Subject: Before: Error: libcgroup initialization failed, 50001
X-Git-Tag: v0.37~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f1d24f61f9cdb562009d1cebb9c862be63d89c4;p=thirdparty%2Flibcgroup.git

Before: Error: libcgroup initialization failed, 50001
Now:    Error: libcgroup initialization failed, Cgroup is not mounted

Changelog:
  - point to /etc/cgrules/conf when loading of the rules failed
    Before: Error: libcgroup failed to initialize rulescache, No such file or
            directory
    Now:    Error: libcgroup failed to initialize rulescache from
            /etc/cgrules.conf. No such file or directory


Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Acked-by:  Ivana Hutarova Varekova <varekova@redhat.com>
---

diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c
index b96107d7..dc3febce 100644
--- a/src/daemon/cgrulesengd.c
+++ b/src/daemon/cgrulesengd.c
@@ -1013,23 +1013,24 @@ int main(int argc, char *argv[])
 
 	/* Initialize libcgroup. */
 	if ((ret = cgroup_init()) != 0) {
-		fprintf(stderr, "Error: libcgroup initialization failed, %d\n",
-				ret);
+		fprintf(stderr, "Error: libcgroup initialization failed, %s\n",
+				cgroup_strerror(ret));
 		goto finished;
 	}
 
 	/* Ask libcgroup to load the configuration rules. */
 	if ((ret = cgroup_init_rules_cache()) != 0) {
 		fprintf(stderr, "Error: libcgroup failed to initialize rules"
-				"cache, %d\n", ret);
+				"cache from %s. %s\n", CGRULES_CONF_FILE,
+				cgroup_strerror(ret));
 		goto finished;
 	}
 
 	/* Now, start the daemon. */
 	ret = cgre_start_daemon(logp, facility, daemon, verbosity);
 	if (ret < 0) {
-		fprintf(stderr, "Error: Failed to launch the daemon, %d\n",
-			ret);
+		fprintf(stderr, "Error: Failed to launch the daemon, %s\n",
+			cgroup_strerror(ret));
 		goto finished;
 	}