[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. debian/0.2.0-git20080909-6-1-gb1e15e7

[Luca Capello]

The following commit has been merged in the debian branch:
commit b1e15e75e18fff189a00054e299314b4903d155a
Author: Luca Capello <luca at pca.it>
Date:   Fri Oct 10 00:14:15 2008 +0200

    debian/fso-frameworkd.init: check for /etc/frameworkd.conf

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..c06eac3
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,9 @@
+fso-frameworkd for Debian
+-------------------------
+
+FSO frameworkd needs a configuration file, namely /etc/frameworkd.conf.
+However, since frameworkd must be configured according to the device,
+Debian cannot provide a general configuration file, but only an example
+in /usr/share/doc/fso-frameworkd/examples/frameworkd.conf.
+
+ -- Luca Capello <luca at pca.it>, Fri, 10 Oct 2008 00:09:16 +0200
diff --git a/debian/changelog b/debian/changelog
index a24f648..4b29901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+fso-frameworkd (0.2.0-git20080909-7) UNRELEASED; urgency=low
+
+  * debian/fso-frameworkd.init:
+    + check for /etc/frameworkd.conf before starting.
+  * debian/fso-frameworkd.install:
+    + install conf/example/frameworkd.conf in the document folder.
+  * debian/README.Debian:
+    + explain the need for /etc/frameworkd.conf.
+
+ --
+
 fso-frameworkd (0.2.0-git20080909-6) pkg-fso; urgency=low
 
   * debian/patches/series: update.
diff --git a/debian/fso-frameworkd.init b/debian/fso-frameworkd.init
index c587cf8..4259253 100755
--- a/debian/fso-frameworkd.init
+++ b/debian/fso-frameworkd.init
@@ -16,6 +16,7 @@ NAME=frameworkd
 DAEMON=/usr/bin/frameworkd
 PIDDIR=/var/run/
 PIDFILE=${PIDDIR}/${NAME}.pid
+CONFFILE=/etc/frameworkd.conf
 
 
 # Gracefully exit if the package has been removed (but not purged).
@@ -30,6 +31,12 @@ PIDFILE=${PIDDIR}/${NAME}.pid
 
 case "$1" in
     start)
+	if [ ! -r "$CONFFILE" ]; then
+	    echo "No $CONFFILE found, frameworkd cannot start.  Please read"
+	    echo "/usr/share/doc/fso-frameworkd/README.Debian."
+	    echo
+	    exit 1
+	fi
         [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
         start-stop-daemon --start --pidfile ${PIDFILE} --make-pidfile --background --exec ${DAEMON}
         [ "$VERBOSE" != no ] && log_end_msg $?
diff --git a/debian/fso-frameworkd.install b/debian/fso-frameworkd.install
index 549751b..c431676 100644
--- a/debian/fso-frameworkd.install
+++ b/debian/fso-frameworkd.install
@@ -2,6 +2,7 @@ usr/share/doc/fso-frameworkd/examples
 usr/bin
 usr/lib
 etc
+conf/example/frameworkd.conf /usr/share/doc/fso-frameworkd/examples
 debian/55-freerunner.rules /etc/udev/rules.d/
 debian/frameworkd.conf /etc
 debian/scenarios /usr/share/openmoko

-- 
FSO frameworkd Debian packaging