Changeset 439


Ignore:
Timestamp:
07/12/07 10:39:34 (14 years ago)
Author:
bastiaans
Message:

pkg/deb/init.d/jobmond:

  • dont exit 1 or dpkg configure will fail

Makefile:

  • updated
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r435 r439  
    6969        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/DEBIAN >/dev/null
    7070        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc/init.d >/dev/null
    71         mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/usr/bin >/dev/null
     71        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc/default >/dev/null
     72        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/usr/sbin >/dev/null
    7273        install -m 755 jobmond/jobmond.py ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/usr/bin
    73         ( cd ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/usr/bin; \
     74        ( cd ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/usr/sbin; \
    7475        ln -s jobmond.py jobmond || true)
    7576        install jobmond/jobmond.conf ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc
    76         install pkg/init.d/jobmond ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc/init.d
     77        install pkg/deb/init.d/jobmond ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc/init.d
     78        install pkg/deb/default/jobmond ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond_${VERSION}-${RELEASE}/etc/default
    7779        ( cd pkg/deb/jobmond/DEBIAN; \
    7880        rsync -a --exclude=.svn --exclude=*_test* --exclude=*-example.php \
  • trunk/pkg/deb/init.d/jobmond

    r437 r439  
    1818        echo -n "Starting $DESC: "
    1919        start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
    20                 --exec $DAEMON -- --pidfile "$PIDFILE" $OPTIONS || { echo " start failed."; exit 1; }
     20                --exec $DAEMON -- --pidfile "$PIDFILE" $OPTIONS || { echo " start failed."; exit 0; }
    2121        echo "$NAME."
    2222        ;;
     
    2424        echo -n "Stopping $DESC: "
    2525        start-stop-daemon --stop  --quiet --pidfile /var/run/$NAME.pid \
    26                 --signal 9 2>&1 > /dev/null || { rm -f "$PIDFILE"; echo " not running."; exit 1; }
     26                --signal 9 2>&1 > /dev/null || { rm -f "$PIDFILE"; echo " not running."; exit 0; }
    2727        echo "$NAME."
    2828        rm -f "$PIDFILE"
Note: See TracChangeset for help on using the changeset viewer.