Changeset 439

Timestamp:

07/12/07 10:39:34 (17 years ago)

Author:

bastiaans

Message:

pkg/deb/init.d/jobmond:

• dont exit 1 or dpkg configure will fail

Makefile:

• updated

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• pkg/deb/init.d/jobmond (modified) (2 diffs)

trunk/Makefile

@@ -69 +69 @@
         mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/DEBIAN >/dev/null
         mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc/init.d >/dev/null
-        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/usr/bin >/dev/null
+        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc/default >/dev/null
+        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/usr/sbin >/dev/null
         install -m 755 jobmond/jobmond.py ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/usr/bin
-        ( cd ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/usr/bin; \
+        ( cd ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/usr/sbin; \
         ln -s jobmond.py jobmond || true)
         install jobmond/jobmond.conf ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc
-        install pkg/init.d/jobmond ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc/init.d
+        install pkg/deb/init.d/jobmond ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc/init.d
+        install pkg/deb/default/jobmond ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc/default
         ( cd pkg/deb/jobmond/DEBIAN; \
         rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php \

trunk/pkg/deb/init.d/jobmond

@@ -18 +18 @@
         echo -n "Starting $DESC: "
         start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-                --exec $DAEMON -- --pidfile "$PIDFILE" $OPTIONS || { echo " start failed."; exit 1; }
+                --exec $DAEMON -- --pidfile "$PIDFILE" $OPTIONS || { echo " start failed."; exit 0; }
         echo "$NAME."
         ;;
@@ -24 +24 @@
         echo -n "Stopping $DESC: "
         start-stop-daemon --stop  --quiet --pidfile /var/run/$NAME.pid \
-                --signal 9 2>&1 > /dev/null || { rm -f "$PIDFILE"; echo " not running."; exit 1; }
+                --signal 9 2>&1 > /dev/null || { rm -f "$PIDFILE"; echo " not running."; exit 0; }
         echo "$NAME."
         rm -f "$PIDFILE"