|
 |
da3e87 |
diff -up libcgroup-0.40.rc1/scripts/init.d/cgred.in.empty-config libcgroup-0.40.rc1/scripts/init.d/cgred.in
|
|
|
da3e87 |
--- libcgroup-0.40.rc1/scripts/init.d/cgred.in.empty-config 2013-08-26 14:24:16.070531165 +0200
|
|
|
da3e87 |
+++ libcgroup-0.40.rc1/scripts/init.d/cgred.in 2013-08-26 14:24:16.072531149 +0200
|
|
|
da3e87 |
@@ -81,10 +81,6 @@ start()
|
|
|
da3e87 |
log_failure_msg "$servicename is already running with PID `cat ${pidfile}`"
|
|
|
da3e87 |
return 0
|
|
|
da3e87 |
fi
|
|
|
da3e87 |
- if [ ! -s $CGRED_CONF ]; then
|
|
|
da3e87 |
- log_failure_msg "not configured"
|
|
|
da3e87 |
- return 6
|
|
|
da3e87 |
- fi
|
|
|
da3e87 |
if ! grep "^cgroup" /proc/mounts &>/dev/null; then
|
|
|
da3e87 |
echo
|
|
|
da3e87 |
log_failure_msg $"Cannot find cgroups, is cgconfig service running?"
|
|
|
da3e87 |
diff -up libcgroup-0.40.rc1/src/api.c.empty-config libcgroup-0.40.rc1/src/api.c
|
|
|
da3e87 |
--- libcgroup-0.40.rc1/src/api.c.empty-config 2013-05-21 15:36:04.000000000 +0200
|
|
|
da3e87 |
+++ libcgroup-0.40.rc1/src/api.c 2013-08-26 14:24:16.073531142 +0200
|
|
|
da3e87 |
@@ -541,17 +541,6 @@ static int cgroup_parse_rules(bool cache
|
|
|
da3e87 |
/* Loop variable. */
|
|
|
da3e87 |
int i = 0;
|
|
|
da3e87 |
|
|
|
da3e87 |
- /* Open the configuration file. */
|
|
|
da3e87 |
- pthread_rwlock_wrlock(&rl_lock);
|
|
|
da3e87 |
- fp = fopen(CGRULES_CONF_FILE, "re");
|
|
|
da3e87 |
- if (!fp) {
|
|
|
da3e87 |
- cgroup_err("Error: failed to open configuration file %s: %s\n",
|
|
|
da3e87 |
- CGRULES_CONF_FILE, strerror(errno));
|
|
|
da3e87 |
- last_errno = errno;
|
|
|
da3e87 |
- ret = ECGOTHER;
|
|
|
da3e87 |
- goto unlock;
|
|
|
da3e87 |
- }
|
|
|
da3e87 |
-
|
|
|
da3e87 |
/* Determine which list we're using. */
|
|
|
da3e87 |
if (cache)
|
|
|
da3e87 |
lst = &rl;
|
|
|
da3e87 |
@@ -562,6 +551,15 @@ static int cgroup_parse_rules(bool cache
|
|
|
da3e87 |
if (lst->head)
|
|
|
da3e87 |
cgroup_free_rule_list(lst);
|
|
|
da3e87 |
|
|
|
da3e87 |
+ /* Open the configuration file. */
|
|
|
da3e87 |
+ pthread_rwlock_wrlock(&rl_lock);
|
|
|
da3e87 |
+ fp = fopen(CGRULES_CONF_FILE, "re");
|
|
|
da3e87 |
+ if (!fp) {
|
|
|
da3e87 |
+ cgroup_warn("Warning: failed to open configuration file %s: %s\n",
|
|
|
da3e87 |
+ CGRULES_CONF_FILE, strerror(errno));
|
|
|
da3e87 |
+ goto unlock;
|
|
|
da3e87 |
+ }
|
|
|
da3e87 |
+
|
|
|
da3e87 |
/* Now, parse the configuration file one line at a time. */
|
|
|
da3e87 |
cgroup_dbg("Parsing configuration file.\n");
|
|
|
da3e87 |
while (fgets(buff, sizeof(buff), fp) != NULL) {
|