cherokee: In the init script pass the config file as a parameter. This

currently matches the default so makes no actual difference. However in the
case where you want to run multiple instances of cherokee it makes it clear
how you specify an alternate configuration file.

diff --git a/packages/cherokee/cherokee_0.5.3.bb b/packages/cherokee/cherokee_0.5.3.bb
index 85b8987..c0f1396 100644 (file)
--- a/packages/cherokee/cherokee_0.5.3.bb
+++ b/packages/cherokee/cherokee_0.5.3.bb
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 
 SRC_URI_append = "file://configure.patch;patch=1 \
                   file://Makefile.in.patch;patch=1 \

diff --git a/packages/cherokee/cherokee_0.5.5.bb b/packages/cherokee/cherokee_0.5.5.bb
index e3e7085..bb9b0f4 100644 (file)
--- a/packages/cherokee/cherokee_0.5.5.bb
+++ b/packages/cherokee/cherokee_0.5.5.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 SRC_URI_append = "file://configure.in.patch;patch=1 \
                   file://Makefile.am.patch;patch=1"

diff --git a/packages/cherokee/files/cherokee.init b/packages/cherokee/files/cherokee.init
index 0ea0fd3..ea1263a 100644 (file)
--- a/packages/cherokee/files/cherokee.init
+++ b/packages/cherokee/files/cherokee.init
@@ -12,7 +12,7 @@ test ! -r "$CONFIG" && exit 0
 case "$1" in
   start)
     echo "Starting $DESC: "
-    start-stop-daemon --oknodo -S -x $DAEMON -- -b
+    start-stop-daemon --oknodo -S -x $DAEMON -- -b -C $CONFIG
     ;;
 
   stop)