summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDhaval Giani <dhaval@linux.vnet.ibm.com>2009-02-12 16:05:00 +0000
committerDhaval Giani <dhaval@linux.vnet.ibm.com>2009-02-12 16:05:00 +0000
commit769ad7af2b82f8c030cc3d6cabaf480606a72d3e (patch)
tree03bc9620f359bfd01e3bbea337b18f8042d00eb7
parent4eef30c1190216951615a865bfa6179458deaf0c (diff)
downloadlibcg-769ad7af2b82f8c030cc3d6cabaf480606a72d3e.tar.gz
libcg-769ad7af2b82f8c030cc3d6cabaf480606a72d3e.tar.xz
libcg-769ad7af2b82f8c030cc3d6cabaf480606a72d3e.zip
libcgroup: Add new command line options to sample config file
From: Jan Safranek <jsafrane@redhat.com> Add new command line options to sample config file Signed-off-by: Jan Safranek <jsafrane@redhat.com> Acked-by: Dhaval Giani <dhaval@linux.vnet.ibm.com> git-svn-id: https://libcg.svn.sourceforge.net/svnroot/libcg/trunk@322 4f4bb910-9a46-0410-90c8-c897d4f1cd53
-rw-r--r--samples/cgred.conf13
-rw-r--r--scripts/init.d/cgred5
2 files changed, 12 insertions, 6 deletions
diff --git a/samples/cgred.conf b/samples/cgred.conf
index 5363be5..14209e5 100644
--- a/samples/cgred.conf
+++ b/samples/cgred.conf
@@ -1,19 +1,22 @@
# /etc/cgred.d/cgred.conf - CGroup Rules Engine Daemon configuration file
#
-# The four options listed below (CONFIG_FILE, LOG_FILE, NODAEMON, NOLOG) are
+# The four options listed below (CONFIG_FILE, LOG_FILE, NODAEMON, LOG) are
# the only valid ones. Defining anything else in this file will cause the
# CGroup Rules Engine program to fail. So, don't do it.
# The pathname to the configuration file for CGroup Rules Engine
CONFIG_FILE="/etc/cgrules.conf"
-# The pathname to the log file for CGroup Rules Engine
-LOG_FILE="/root/cgrulesengd.log"
+# Uncomment the following line to log to specified file instead of syslog
+#LOG_FILE="/var/log/cgrulesengd.log"
# Uncomment the second line to run CGroup Rules Engine in non-daemon mode
NODAEMON=""
#NODAEMON="--nodaemon"
# Uncomment the second line to disable logging for CGroup Rules Engine
-NOLOG=""
-#NOLOG="--nolog"
+# Uncomment the third line to enable more verbose logging.
+LOG=""
+#LOG="--nolog"
+#LOG="-v"
+
diff --git a/scripts/init.d/cgred b/scripts/init.d/cgred
index ee9fc40..f0eebc4 100644
--- a/scripts/init.d/cgred
+++ b/scripts/init.d/cgred
@@ -50,7 +50,10 @@ CGRED_BIN=${exec_prefix}/${bindir}/cgrulesengd
# Read in configuration options.
if [ -f "/etc/cgred.d/cgred.conf" ] ; then
. /etc/cgred.d/cgred.conf
- OPTIONS="--log $LOG_FILE $NODAEMON $NOLOG"
+ OPTIONS="$NODAEMON $LOG"
+ if [ -n "$LOG_FILE" ]; then
+ OPTIONS="$OPTIONS --log-file=$LOG_FILE"
+ fi
else
OPTIONS=""
fi