------------------------------------------------------------
revno: 70
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Sun 2014-04-27 12:14:25 +0100
message:
auto update
removed:
etc/init.d/iptables-persistent
added:
lib/systemd/system/exabgp.service
lib/systemd/system/geoclue.service
lib/systemd/system/lightdm.service
lib/systemd/system/monopd.service
lib/systemd/system/monopd.socket
lib/systemd/system/prads.service
lib/systemd/system/resolvconf.service
lib/systemd/system/screen-cleanup.service@
kind changed:
etc/init.d/resolvconf@ (symlink => file)
modified:
etc/init.d/c-icap
etc/init.d/exabgp
etc/init.d/flashybrid
etc/init.d/gld
etc/init.d/gnunet-server
etc/init.d/mopidy
etc/init.d/motion
etc/init.d/mpd
etc/init.d/osspd
etc/init.d/postfwd
etc/init.d/prads
etc/init.d/ps-watcher
etc/init.d/salt-master
etc/init.d/saslauthd
etc/init.d/supervisor
etc/init.d/uruk
etc/init/yrmcds.conf
lib/systemd/system/mpd.service
lib/systemd/system/osspd.service
lib/systemd/system/yrmcds.service
--
lp:~upstart-devel/upstart/upstart-jobs
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs
Your team Upstart Reviewers is subscribed to branch
lp:~upstart-devel/upstart/upstart-jobs.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/upstart-jobs/+edit-subscription
=== modified file 'etc/init.d/c-icap'
--- etc/init.d/c-icap 2014-04-09 00:24:49 +0000
+++ etc/init.d/c-icap 2014-04-27 11:14:25 +0000
@@ -47,10 +47,11 @@
#
slurp_config()
{
- local CONFFILE
+ local CONFFILE="$1"
+ local var_regexp_group='\(User\|Group\|CommandsSocket\)'
+ local full_regexp="^[[:space:]]*${var_regexp_group}[[:space:]]\+\([^']*\)$"
local variable
local value
- CONFFILE="$1"
# Some default values
config_CommandsSocket=/var/run/c-icap/c-icap.ctl
@@ -58,13 +59,17 @@
config_Group=c-icap
if [ -f "$CONFFILE" ]; then
- for variable in `egrep -v '^[[:space:]]*(#|$)' "$CONFFILE" | awk '{print $1}'`; do
- value=`grep ^$variable $CONFFILE | head -n1 | awk '{print $2}'`
-
+ local line
+ local old_IFS="$IFS"
+ IFS=$'\n'
+ for line in `grep "${full_regexp}" "$CONFFILE"`; do
+ variable=$(echo "$line" | sed "s/${full_regexp}/\\1/")
+ value=$(echo "$line" | sed "s/${full_regexp}/\\2/")
if [ -n "$value" ]; then
export "config_$variable"="$value"
fi
done
+ IFS="${old_IFS}"
fi
}
=== modified file 'etc/init.d/exabgp'
--- etc/init.d/exabgp 2014-04-09 00:24:49 +0000
+++ etc/init.d/exabgp 2014-04-27 11:14:25 +0000
@@ -20,9 +20,9 @@
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="BGP route injector"
USER=exabgp
-NAME=exabgp
+NAME=exabgp
DAEMON=/usr/sbin/exabgp
-DAEMON_ARGS=""
+DAEMON_ARGS=""
PIDFILE=/var/run/$NAME/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
@@ -67,7 +67,7 @@
# 1 if daemon was already running
# 2 if daemon could not be started
# We create the PID file and we do background thanks to start-stop-daemon
- start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER -b -m --exec $DAEMON -- $DAEMON_OPTS
+ start-stop-daemon --start --quiet --pidfile $PIDFILE -c $USER -b -m --exec $DAEMON -- $DAEMON_OPTS
return $?
fi
fi
@@ -104,11 +104,18 @@
}
#
-# Function that sends a SIGHUP to the daemon/service
+# Function that sends a SIGUSR1 to the daemon/service
#
do_reload() {
if [ "$EXABGPRUN" = "yes" ] || [ "$EXABGPRUN" = "YES" ]; then
- start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE -c $USER
+ start-stop-daemon --stop --signal USR1 --quiet --pidfile $PIDFILE -c $USER
+ return 0
+ fi
+}
+
+do_force_reload() {
+ if [ "$EXABGPRUN" = "yes" ] || [ "$EXABGPRUN" = "YES" ]; then
+ start-stop-daemon --stop --signal USR2 --quiet --pidfile $PIDFILE -c $USER
return 0
fi
}
@@ -118,7 +125,7 @@
start-stop-daemon --status --quiet --pidfile $PIDFILE -c $USER
retval=$?
if [ $retval -eq 0 ] ; then
- log_warning_msg "$NAME is already running"
+ log_warning_msg "$NAME is already running"
log_end_msg 1
else
log_daemon_msg "Starting $DESC" "$NAME "
@@ -140,12 +147,17 @@
status)
status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $?
;;
- reload|force-reload)
+ reload)
log_daemon_msg "Reloading $DESC" "$NAME "
do_reload
log_end_msg $?
;;
- restart|force-reload)
+ force-reload)
+ log_daemon_msg "Reloading $DESC (and subprocesses)" "$NAME "
+ do_force_reload
+ log_end_msg $?
+ ;;
+ restart)
log_daemon_msg "Restarting $DESC" "$NAME "
do_stop
case "$?" in
@@ -164,7 +176,7 @@
esac
;;
*)
- log_warning_msg "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}"
+ log_warning_msg "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload|status}"
log_end_msg 3
exit 3
;;
=== modified file 'etc/init.d/flashybrid'
--- etc/init.d/flashybrid 2014-04-09 00:24:49 +0000
+++ etc/init.d/flashybrid 2014-04-27 11:14:25 +0000
@@ -8,16 +8,19 @@
# Licensed under the terms of GPL v2
# Diego Iastrubni <[email protected]> 2006
# Joey Hess <[email protected]> 2002-2006
+# Thibaut VARENE <[email protected]> 2014
### BEGIN INIT INFO
# Provides: flashybrid
-# Required-Start: $all
-# Required-Stop: $syslog
-# Should-Start: $local_fs
-# Should-Stop: $local_fs
-# Default-Start: 2 3 4 5
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Should-Start:
+# Should-Stop:
+# Default-Start: S
# Default-Stop: 0 1 6
+# X-Start-Before: $network
+# X-Stop-Before: $network
# Short-Description: automates use of a flash disk as the root filesystem
# Description: Flashybrid is a system to help in setting up and managing hybrid
# flash/disk/ram based Debian systems which can run most of the time
@@ -27,6 +30,8 @@
# mb is more comfortable.
### END INIT INFO
+. /lib/lsb/init-functions
+
CONFDIR=/etc/flashybrid
if [ -e $CONFDIR/config ]; then
. $CONFDIR/config
@@ -48,18 +53,16 @@
case "$1" in
start)
if [ "$ENABLED" != yes ]; then
- echo "Not setting up flashybrid system: disabled."
+ log_warning_msg "Not setting up flashybrid system: disabled."
exit
fi
if [ ! -d "$RAMMOUNT" ] ; then
- echo "Error, RAMMOUNT directory is not found ($RAMMOUNT)"
+ log_failure_msg "Error, RAMMOUNT directory is not found ($RAMMOUNT)"
exit 1
fi
- if [ "$VERBOSE" != yes ]; then
- echo -n "Setting up flashybrid system..."
- fi
+ log_daemon_msg "Setting up flashybrid system for"
EXTRA_PARAMS=""
@@ -94,7 +97,7 @@
# Skip dirs that are not present.
if [ -d $dir ]; then
if [ "$VERBOSE" = yes ]; then
- echo -n "Syncrhonizing RAM - $dir"
+ log_progress_msg "$dir"
fi
ramdir=$RAMMOUNT$dir
@@ -113,22 +116,16 @@
mkdir -p $ramdir.flash
mount --bind $dir $ramdir.flash
mount --bind $ramdir $dir
-
- if [ "$VERBOSE" = yes ]; then
- echo "."
- fi
fi
done
- if [ "$VERBOSE" != yes ]; then
- echo "done."
- fi
+ log_end_msg 0
mountro
;;
stop)
if [ "$ENABLED" != yes ]; then
- echo "Not shutting down flashybrid system: disabled."
+ log_warning_msg "Not shutting down flashybrid system: disabled."
exit
fi
=== modified file 'etc/init.d/gld'
--- etc/init.d/gld 2014-04-09 00:24:49 +0000
+++ etc/init.d/gld 2014-04-27 11:14:25 +0000
@@ -29,6 +29,13 @@
exit 0
fi
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
case "$1" in
start)
echo -n "Starting $DESC: $NAME"
@@ -40,8 +47,8 @@
stop)
# start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
# --exec $DAEMON
- pid=`ps ax | awk '$5 == "/usr/sbin/gld" { print $1 }'`
- if [ "$pid" ]; then
+ pid=`ps ax | awk '$5 == "/usr/sbin/gld" { print $1 }'`
+ if [ "$pid" ]; then
echo -n "Stopping $DESC: $NAME"
kill $pid
echo "."
@@ -59,7 +66,15 @@
echo "done."
else
echo "No gld daemon found"
- fi
+ fi
+ ;;
+ status)
+ pid=`ps ax | awk '$5 == "/usr/sbin/gld" { print $1 }'`
+ if [ "$pid" ]; then
+ log_begin_msg "Checking $DESC: $NAME ... "
+ kill -0 $pid && exit 0
+ fi
+ exit 3
;;
restart)
# start-stop-daemon --stop --quiet --pidfile \
@@ -72,7 +87,7 @@
;;
*)
N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+ echo "Usage: $N {start|stop|status|restart|reload|force-reload}" >&2
exit 1
;;
esac
=== modified file 'etc/init.d/gnunet-server'
--- etc/init.d/gnunet-server 2014-04-09 00:24:49 +0000
+++ etc/init.d/gnunet-server 2014-04-27 11:14:25 +0000
@@ -1,64 +1,114 @@
-#!/bin/sh
-
+#! /bin/sh
### BEGIN INIT INFO
-# Provides: gnunet-server
-# Required-Start: $syslog $network $local_fs $remote_fs
-# Required-Stop: $syslog $network $local_fs $remote_fs
-# Should-Start:
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Starts the GNUnet server at boot time.
-# Description: GNUnet is a secure, trust-based peer-to-peer framework.
+# Provides: gnunet-server
+# Required-Start: $remote_fs $syslog $network
+# Required-Stop: $remote_fs $syslog $network
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Starts the GNUnet server at boot time.
+# Description: GNUnet is a secure, trust-based peer-to-peer framework.
### END INIT INFO
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/gnunet-service-arm
-NAME=gnunet-service-arm
-DESC=GNUnet
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="GNUnet"
+NAME=gnunet-server
+DAEMON=/usr/lib/i386-linux-gnu/gnunet/libexec/gnunet-service-arm
LOGFILE=/var/log/gnunetd/gnunetd.log
-
-test -x "${DAEMON}" || exit 0
-
-set -e
-
-# Get configuration
-if [ -f /etc/default/gnunet-server ]
-then
- . /etc/default/gnunet-server
-fi
-
-if [ "${GNUNET_AUTOSTART}" != "true" ]
-then
- exit 0
-fi
-
-case "${1}" in
- start)
- echo -n "Starting ${DESC}: "
- start-stop-daemon --start --chuid ${GNUNET_USER} \
- --oknodo --quiet --exec ${DAEMON} -- -c \
- /etc/gnunet.conf -d -l $LOGFILE
- echo "${NAME}."
- ;;
-
- stop)
- echo -n "Stopping ${DESC}: "
- start-stop-daemon --stop --retry 15 \
- --oknodo --quiet --exec ${DAEMON}
- echo "${NAME}."
- ;;
-
- restart|force-reload)
- ${0} stop
- sleep 1
- ${0} start
- ;;
-
- *)
- echo "Usage: ${0} {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
+DAEMON_ARGS="-c /etc/gnunet.conf -d -l $LOGFILE"
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+[ "${GNUNET_AUTOSTART}" != "true" ] && exit 0
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
+ || return 1
+ start-stop-daemon --start --quiet --chuid $GNUNET_USER --exec $DAEMON -- \
+ $DAEMON_ARGS \
+ || return 2
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --exec $DAEMON
+ RETVAL="$?"
+ [ "$RETVAL" = 2 ] && return 2
+ start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
+ [ "$?" = 2 ] && return 2
+ return "$RETVAL"
+}
+
+case "$1" in
+ start)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+ do_start
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ status)
+ status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+ ;;
+ restart|force-reload)
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1)
+ do_start
+ case "$?" in
+ 0) log_end_msg 0 ;;
+ 1) log_end_msg 1 ;; # Old process is still running
+ *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+ *)
+ # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+ exit 3
+ ;;
esac
-exit 0
+:
=== removed file 'etc/init.d/iptables-persistent'
--- etc/init.d/iptables-persistent 2014-04-09 00:24:49 +0000
+++ etc/init.d/iptables-persistent 1970-01-01 00:00:00 +0000
@@ -1,149 +0,0 @@
-#!/bin/sh
-# Written by Simon Richter <[email protected]>
-# modified by Jonathan Wiltshire <[email protected]>
-# with help from Christoph Anton Mitterer
-#
-
-### BEGIN INIT INFO
-# Provides: iptables-persistent
-# Required-Start: mountkernfs $local_fs
-# Required-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# X-Start-Before: $network
-# X-Stop-After: $network
-# Short-Description: Set up iptables rules
-# Description: Loads/saves current iptables rules from/to /etc/iptables
-# to provide a persistent rule set during boot time
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-rc=0
-
-load_rules()
-{
- log_action_begin_msg "Loading iptables rules"
-
- #load IPv4 rules
- if [ ! -f /etc/iptables/rules.v4 ]; then
- log_action_cont_msg " skipping IPv4 (no rules to load)"
- else
- log_action_cont_msg " IPv4"
- iptables-restore < /etc/iptables/rules.v4 2> /dev/null
- if [ $? -ne 0 ]; then
- rc=1
- fi
- fi
-
- #load IPv6 rules
- if [ ! -f /etc/iptables/rules.v6 ]; then
- log_action_cont_msg " skipping IPv6 (no rules to load)"
- else
- log_action_cont_msg " IPv6"
- ip6tables-restore < /etc/iptables/rules.v6 2> /dev/null
- if [ $? -ne 0 ]; then
- rc=1
- fi
- fi
-
- log_action_end_msg $rc
-}
-
-save_rules()
-{
- log_action_begin_msg "Saving rules"
-
- #save IPv4 rules
- #need at least iptable_filter loaded:
- /sbin/modprobe -q iptable_filter
- if [ ! -f /proc/net/ip_tables_names ]; then
- log_action_cont_msg " skipping IPv4 (no modules loaded)"
- elif [ -x /sbin/iptables-save ]; then
- log_action_cont_msg " IPv4"
- iptables-save > /etc/iptables/rules.v4
- if [ $? -ne 0 ]; then
- rc=1
- fi
- fi
-
- #save IPv6 rules
- #need at least ip6table_filter loaded:
- /sbin/modprobe -q ip6table_filter
- if [ ! -f /proc/net/ip6_tables_names ]; then
- log_action_cont_msg " skipping IPv6 (no modules loaded)"
- elif [ -x /sbin/ip6tables-save ]; then
- log_action_cont_msg " IPv6"
- ip6tables-save > /etc/iptables/rules.v6
- if [ $? -ne 0 ]; then
- rc=1
- fi
- fi
-
- log_action_end_msg $rc
-}
-
-flush_rules()
-{
- log_action_begin_msg "Flushing rules"
-
- if [ ! -f /proc/net/ip_tables_names ]; then
- log_action_cont_msg " skipping IPv4 (no module loaded)"
- elif [ -x /sbin/iptables ]; then
- log_action_cont_msg " IPv4"
- for param in F Z X; do /sbin/iptables -$param; done
- for table in $(cat /proc/net/ip_tables_names)
- do
- /sbin/iptables -t $table -F
- /sbin/iptables -t $table -Z
- /sbin/iptables -t $table -X
- done
- for chain in INPUT FORWARD OUTPUT
- do
- /sbin/iptables -P $chain ACCEPT
- done
- fi
-
- if [ ! -f /proc/net/ip6_tables_names ]; then
- log_action_cont_msg " skipping IPv6 (no module loaded)"
- elif [ -x /sbin/ip6tables ]; then
- log_action_cont_msg " IPv6"
- for param in F Z X; do /sbin/ip6tables -$param; done
- for table in $(cat /proc/net/ip6_tables_names)
- do
- /sbin/ip6tables -t $table -F
- /sbin/ip6tables -t $table -Z
- /sbin/ip6tables -t $table -X
- done
- for chain in INPUT FORWARD OUTPUT
- do
- /sbin/ip6tables -P $chain ACCEPT
- done
- fi
-
- log_action_end_msg 0
-}
-
-case "$1" in
-start|restart|reload|force-reload)
- load_rules
- ;;
-save)
- save_rules
- ;;
-stop)
- # Why? because if stop is used, the firewall gets flushed for a variable
- # amount of time during package upgrades, leaving the machine vulnerable
- # It's also not always desirable to flush during purge
- echo "Automatic flushing disabled, use \"flush\" instead of \"stop\""
- ;;
-flush)
- flush_rules
- ;;
-*)
- echo "Usage: $0 {start|restart|reload|force-reload|save|flush}" >&2
- exit 1
- ;;
-esac
-
-exit $rc
=== modified file 'etc/init.d/mopidy'
--- etc/init.d/mopidy 2014-04-09 00:24:49 +0000
+++ etc/init.d/mopidy 2014-04-27 11:14:25 +0000
@@ -17,7 +17,9 @@
DAEMON=/usr/bin/mopidy
DAEMON_USER=mopidy
DAEMON_GROUP=audio
-DAEMON_ARGS="--quiet --config $(printf "%s:" /etc/mopidy/extensions.d/*.conf /etc/mopidy/mopidy.conf)"
+CONFIG_FILES=$(printf ":%s" /etc/mopidy/extensions.d/*.conf /etc/mopidy/mopidy.conf)
+CONFIG_FILES=$(echo $CONFIG_FILES | awk '{ s=substr($0, 2); print s; }')
+DAEMON_ARGS="--quiet --config $CONFIG_FILES"
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
@@ -60,14 +62,11 @@
return "$RETVAL"
}
-do_reload()
-{
- su -s /bin/sh -c "$DAEMON $DAEMON_ARGS local scan" $DAEMON_USER && return 0
- log_warning_msg "$NAME: reload failed with error code $?."
- return 2
-}
+# Remove the action from $@ before it is used by the run action
+action=$1
+[ "$action" != "" ] && shift
-case "$1" in
+case "$action" in
start)
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
do_start
@@ -92,11 +91,7 @@
do_stop
case "$?" in
0|1)
- if [ "$1" = "force-reload" ]; then
- do_reload && do_start
- else
- do_start
- fi
+ do_start
case "$?" in
0) log_end_msg 0 ;;
1) log_end_msg 1 ;; # Old process is still running
@@ -109,8 +104,20 @@
;;
esac
;;
+ run)
+ if [ "$1" = "" ]; then
+ echo "Usage: $SCRIPTNAME run [options-or-subcommands]"
+ echo "Examples:"
+ echo " $SCRIPTNAME run --help"
+ echo " $SCRIPTNAME run config"
+ echo " $SCRIPTNAME run local scan"
+ exit 3
+ fi
+ CMD="$DAEMON $DAEMON_ARGS $@"
+ su -s /bin/sh -c "$CMD" -- $DAEMON_USER
+ ;;
*)
- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+ echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload|run}" >&2
exit 3
;;
esac
=== modified file 'etc/init.d/motion'
--- etc/init.d/motion 2014-04-09 00:24:49 +0000
+++ etc/init.d/motion 2014-04-27 11:14:25 +0000
@@ -101,8 +101,12 @@
$0 restart-motion
;;
+ status)
+ status_of_proc /usr/bin/motion motion
+ ;;
+
*)
- echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload}"
+ echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|status}"
RET=1
;;
esac
=== modified file 'etc/init.d/mpd'
--- etc/init.d/mpd 2014-04-09 00:24:49 +0000
+++ etc/init.d/mpd 2014-04-27 11:14:25 +0000
@@ -20,7 +20,6 @@
DESC="Music Player Daemon"
DAEMON=/usr/bin/mpd
MPDCONF=/etc/mpd.conf
-START_MPD=true
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
@@ -37,11 +36,6 @@
PIDFILE=$(sed -n 's/^[[:space:]]*pid_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF)
mpd_start () {
- if [ "$START_MPD" != "true" ]; then
- log_action_msg "Not starting MPD: disabled by /etc/default/$NAME".
- exit 0
- fi
-
log_daemon_msg "Starting $DESC" "$NAME"
if [ -z "$PIDFILE" -o -z "$DBFILE" ]; then
=== modified file 'etc/init.d/osspd'
--- etc/init.d/osspd 2014-04-09 00:24:49 +0000
+++ etc/init.d/osspd 2014-04-27 11:14:25 +0000
@@ -32,7 +32,6 @@
#
do_start()
{
- modprobe cuse # make sure the cuse module is loaded
# Return
# 0 if daemon has been started
# 1 if daemon was already running
=== modified file 'etc/init.d/postfwd'
--- etc/init.d/postfwd 2014-04-09 00:24:49 +0000
+++ etc/init.d/postfwd 2014-04-27 11:14:25 +0000
@@ -22,6 +22,8 @@
PIDFILE=/var/run/$NAME.pid
DESC=postfwd
+. /lib/lsb/init-functions
+
test -x $DAEMON || exit 0
not_configured () {
=== modified file 'etc/init.d/prads'
--- etc/init.d/prads 2014-04-09 00:24:49 +0000
+++ etc/init.d/prads 2014-04-27 11:14:25 +0000
@@ -18,25 +18,25 @@
DESC="Prads Realtime Asset Detection System"
NAME="prads"
DAEMON="/usr/bin/${NAME}"
-CONFIG="/etc/{$NAME}/{$NAME}.conf"
-USER="prads"
-GROUP="prads"
-CHROOT="/var/run/prads"
-PIDFILE="prads.pid"
-
-DAEMON_OPTS="-D -u $(id -u $USER) -g $(id -g $GROUP) -C $CHROOT -p $PIDFILE"
test -f $DAEMON || exit 0
# Read LSB init functions
. /lib/lsb/init-functions
-# Read service defaults, if it exists
+# Read DAEMON_OPTS from defaults file, if it exists
if [ -r /etc/default/$NAME -a -f /etc/default/$NAME ]
then
. /etc/default/$NAME
fi
+USER="prads"
+GROUP="prads"
+CHROOT="/run/prads"
+PIDFILE="prads.pid"
+
+DAEMON_OPTS="-D -u $USER -g $GROUP -C $CHROOT -p $PIDFILE ${DAEMON_OPTS:-}"
+
create_chroot() {
install -o $USER -g $GROUP -d $CHROOT
}
@@ -46,9 +46,7 @@
[ ! -d $CHROOT ] && create_chroot
start-stop-daemon --start --quiet --pidfile $CHROOT/$PIDFILE \
--umask "007" \
- --exec $DAEMON -- $DAEMON_OPTS \
- ${INTERFACE:+-i "${INTERFACE}"} \
- ${HOME_NETS:+-a "${HOME_NETS}"} 2>&1
+ --exec $DAEMON -- $DAEMON_OPTS
log_end_msg $?
}
=== modified file 'etc/init.d/ps-watcher'
--- etc/init.d/ps-watcher 2014-04-09 00:24:49 +0000
+++ etc/init.d/ps-watcher 2014-04-27 11:14:25 +0000
@@ -23,6 +23,8 @@
test -x $DAEMON || exit 0
+. /lib/lsb/init-functions
+
# Include ps-watcher defaults if available
if [ -f /etc/default/ps-watcher ] ; then
. /etc/default/ps-watcher
=== modified symlink 'etc/init.d/resolvconf' (properties changed: -x to +x)
=== target was u'/lib/init/upstart-job'
--- etc/init.d/resolvconf 1970-01-01 00:00:00 +0000
+++ etc/init.d/resolvconf 2014-04-27 11:14:25 +0000
@@ -0,0 +1,93 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides: resolvconf
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# X-Start-Before: networking ifupdown
+# Default-Start: S
+# Default-Stop: 0 6
+# Short-Description: Nameserver information manager
+# Description: This service manages the list of nameserver addresses
+# used by the libc resolver and name service caches
+### END INIT INFO
+#
+# This file is part of the resolvconf package.
+#
+# We really need "X-Stop-Before: networking ifupdown" too because
+# terminal ifdowns shouldn't update resolv.conf;
+# however there is unfortunately no such thing as "X-Stop-Before".
+#
+# This file is not used in Ubuntu.
+#
+
+# Don't use set -e; check return status instead.
+
+[ -x /sbin/resolvconf ] || exit 0
+
+PATH=/sbin:/bin
+
+. /lib/lsb/init-functions
+
+# $1 EXITSTATUS
+# [$2 MESSAGE]
+log_action_end_msg_and_exit()
+{
+ log_action_end_msg "$1" ${2:+"$2"}
+ exit $1
+}
+
+case "$1" in
+ start)
+ # The "start" method should only be used at boot time.
+ # Don't run this on package upgrade, for example.
+ log_action_begin_msg "Setting up resolvconf"
+ # Wipe runtime directories in case they aren't on a tmpfs
+ resolvconf --wipe-runtime-directories || log_action_end_msg_and_exit 1 "failed to delete the old contents of run-time directories"
+ # Create runtime directories in case they are on a tmpfs
+ resolvconf --create-runtime-directories || log_action_end_msg_and_exit 1 "failed to create run-time directories"
+ # Request a postponed update (needed in case the base file has content).
+ resolvconf -u || log_action_end_msg_and_exit 1 "failed requesting update"
+ # Enable updates and perform the postponed update.
+ resolvconf --enable-updates || log_action_end_msg_and_exit 1 "failed to enable updates"
+ log_action_end_msg_and_exit 0
+ ;;
+ stop)
+ # The "stop" method should only be used at shutdown time.
+ log_action_begin_msg "Stopping resolvconf"
+ resolvconf --disable-updates || log_action_end_msg_and_exit 1 "failed to disable updates"
+ log_action_end_msg_and_exit 0
+ ;;
+ restart)
+ log_action_begin_msg "Restarting resolvconf"
+ resolvconf --enable-updates || log_action_end_msg_and_exit 1 "failed to enable updates"
+ log_action_end_msg_and_exit 0
+ ;;
+ reload|force-reload)
+ resolvconf -u || log_action_end_msg_and_exit 1 "failed to update"
+ exit 0
+ ;;
+ enable-updates)
+ resolvconf --enable-updates || log_action_end_msg_and_exit 1 "failed to enable updates"
+ exit 0
+ ;;
+ disable-updates)
+ resolvconf --disable-updates || log_action_end_msg_and_exit 1 "failed to disable updates"
+ exit 0
+ ;;
+ status)
+ if resolvconf --updates-are-enabled ; then
+ log_success_msg "resolvconf updates are enabled"
+ else
+ log_failure_msg "resolvconf updates are disabled"
+ fi
+ exit 0
+ ;;
+ *)
+ echo "Usage: /etc/init.d/resolvconf {start|stop|restart|reload|force-reload|enable-updates|disable-updates|status}" >&2
+ exit 3
+ ;;
+esac
+
+# Don't reach here
+exit 99
=== modified file 'etc/init.d/salt-master'
--- etc/init.d/salt-master 2014-04-09 00:24:49 +0000
+++ etc/init.d/salt-master 2014-04-27 11:14:25 +0000
@@ -48,8 +48,14 @@
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
- RETVAL="$?"
+ pids=$(pidof -x $DAEMON)
+ if [ $? -eq 0 ] ; then
+ echo $pids | xargs kill 2&1> /dev/null
+ RETVAL=0
+ else
+ RETVAL=1
+ fi
+
[ "$RETVAL" = 2 ] && return 2
rm -f $PIDFILE
return "$RETVAL"
=== modified file 'etc/init.d/saslauthd'
--- etc/init.d/saslauthd 2014-04-09 00:24:49 +0000
+++ etc/init.d/saslauthd 2014-04-27 11:14:25 +0000
@@ -4,7 +4,7 @@
# Required-Start: $local_fs $remote_fs
# Required-Stop: $local_fs $remote_fs
# Default-Start: 2 3 4 5
-# Default-Stop: 1
+# Default-Stop: 0 1 6
# Short-Description: saslauthd startup script
# Description: This script starts the saslauthd daemon. It is
# configured using the file /etc/default/saslauthd.
@@ -101,6 +101,11 @@
log_daemon_msg "Starting $DESC" "$NAME"
+ # Check to see if the debug option is specified; fail if it is
+ if [ `expr match "$OPTIONS" '-d'` -ne 0 ]; then
+ log_failure_msg "The debug option (-d) has been set in /etc/default/saslauthd or elsewhere, not starting"
+ return 1
+ fi
# Set OPTIONS to a default value, as noted in the defaults file
if [ -z "$OPTIONS" ]; then
log_warning_msg "Options (OPTIONS) undefined in $1, using default (-c -m /var/run/saslauthd)"
=== modified file 'etc/init.d/supervisor'
--- etc/init.d/supervisor 2014-04-09 00:24:49 +0000
+++ etc/init.d/supervisor 2014-04-27 11:14:25 +0000
@@ -80,7 +80,7 @@
kill -9 $pid
[ -n "$DODTIME" ] && sleep "$DODTIME"s
if running ; then
- echo "Cannot kill $LABEL (pid=$pid)!"
+ echo "Cannot kill $NAME (pid=$pid)!"
exit 1
fi
fi
@@ -148,7 +148,7 @@
echo "$NAME."
;;
status)
- echo -n "$LABEL is "
+ echo -n "$NAME is "
if running ; then
echo "running"
else
=== modified file 'etc/init.d/uruk'
--- etc/init.d/uruk 2014-04-09 00:24:49 +0000
+++ etc/init.d/uruk 2014-04-27 11:14:25 +0000
@@ -141,8 +141,6 @@
}
-set -e
-
case "$1" in
start)
urukctl start
=== modified file 'etc/init/yrmcds.conf'
--- etc/init/yrmcds.conf 2014-01-20 12:08:28 +0000
+++ etc/init/yrmcds.conf 2014-04-27 11:14:25 +0000
@@ -32,4 +32,7 @@
# sleep 5
#end script
+setuid yrmcds
+setgid yrmcds
+
exec /usr/sbin/yrmcdsd
=== added file 'lib/systemd/system/exabgp.service'
--- lib/systemd/system/exabgp.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/exabgp.service 2014-04-27 11:14:25 +0000
@@ -0,0 +1,11 @@
+[Unit]
+Description=ExaBGP
+After=network.target
+
+[Service]
+Environment=exabgp.daemon.daemonize=false
+Environment=exabgp.log.destination=stdout
+ExecStart=/usr/sbin/exabgp /etc/exabgp/exabgp.conf
+
+[Install]
+WantedBy=multi-user.target
=== added file 'lib/systemd/system/geoclue.service'
--- lib/systemd/system/geoclue.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/geoclue.service 2014-04-27 11:14:25 +0000
@@ -0,0 +1,8 @@
+[Unit]
+Description=Location Lookup Service
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.GeoClue2
+User=geoclue
+ExecStart=/usr/lib/geoclue-2.0/geoclue -t 5
=== added file 'lib/systemd/system/lightdm.service'
--- lib/systemd/system/lightdm.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/lightdm.service 2014-04-27 11:14:25 +0000
@@ -0,0 +1,12 @@
+[Unit]
+Description=Light Display Manager
+Documentation=man:lightdm(1)
+After=systemd-user-sessions.service
+
+[Service]
+# temporary safety check until all DMs are converted to correct
+# display-manager.service symlink handling
+ExecStartPre=/bin/sh -c '[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/sbin/lightdm" ]'
+ExecStart=/usr/sbin/lightdm
+Restart=always
+BusName=org.freedesktop.DisplayManager
=== added file 'lib/systemd/system/monopd.service'
--- lib/systemd/system/monopd.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/monopd.service 2014-04-27 11:14:25 +0000
@@ -0,0 +1,12 @@
+[Unit]
+Description=game server for board games like GtkAtlantic
+Documentation=man:monopd(6)
+
+[Service]
+Type=notify
+ExecStart=/usr/sbin/monopd
+User=nobody
+Group=nogroup
+
+[Install]
+WantedBy=multi-user.target
=== added file 'lib/systemd/system/monopd.socket'
--- lib/systemd/system/monopd.socket 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/monopd.socket 2014-04-27 11:14:25 +0000
@@ -0,0 +1,7 @@
+Description=monopd listening socket
+
+[Socket]
+ListenStream=1234
+
+[Install]
+WantedBy=sockets.target
=== modified file 'lib/systemd/system/mpd.service'
--- lib/systemd/system/mpd.service 2014-04-09 00:26:24 +0000
+++ lib/systemd/system/mpd.service 2014-04-27 11:14:25 +0000
@@ -3,7 +3,8 @@
After=network.target sound.target
[Service]
-ExecStart=/usr/bin/mpd --no-daemon
+EnvironmentFile=/etc/default/mpd
+ExecStart=/usr/bin/mpd --no-daemon $MPDCONF
[Install]
WantedBy=multi-user.target
=== modified file 'lib/systemd/system/osspd.service'
--- lib/systemd/system/osspd.service 2014-04-09 00:26:24 +0000
+++ lib/systemd/system/osspd.service 2014-04-27 11:14:25 +0000
@@ -2,7 +2,6 @@
Description=OSS Proxy Daemon
[Service]
-ExecStartPre=/sbin/modprobe cuse
ExecStart=/usr/sbin/osspd -f --dsp-slave=/usr/lib/osspd/ossp-slave
[Install]
=== added file 'lib/systemd/system/prads.service'
--- lib/systemd/system/prads.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/prads.service 2014-04-27 11:14:25 +0000
@@ -0,0 +1,12 @@
+[Unit]
+Description=Passive Realtime Asset Detection System
+Documentation=man:prads(1) man:prads-asset-report(1)
+Documentation=http://gamelinux.github.io/prads/
+
+[Service]
+EnvironmentFile=/etc/default/prads
+UMask=0027
+ExecStart=/usr/bin/prads -u prads -g prads -C /run/prads -p prads.pid $DAEMON_OPTS
+
+[Install]
+WantedBy=multi-user.target
=== added file 'lib/systemd/system/resolvconf.service'
--- lib/systemd/system/resolvconf.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/resolvconf.service 2014-04-27 11:14:25 +0000
@@ -0,0 +1,14 @@
+[Unit]
+Description=Nameserver information manager
+Documentation=man:resolvconf(8)
+DefaultDependencies=no
+
+[Service]
+RemainAfterExit=yes
+ExecStartPre=/bin/mkdir -p /run/resolvconf/interface
+ExecStartPre=/bin/touch /run/resolvconf/postponed-update
+ExecStart=/sbin/resolvconf --enable-updates
+ExecStop=/sbin/resolvconf --disable-updates
+
+[Install]
+WantedBy=network.target
=== added symlink 'lib/systemd/system/screen-cleanup.service'
=== target is u'/dev/null'
=== modified file 'lib/systemd/system/yrmcds.service'
--- lib/systemd/system/yrmcds.service 2014-04-09 00:26:24 +0000
+++ lib/systemd/system/yrmcds.service 2014-04-27 11:14:25 +0000
@@ -5,6 +5,8 @@
[Service]
Type=simple
+User=yrmcds
+Group=yrmcds
ExecStart=/usr/sbin/yrmcdsd
ExecReload=/bin/kill -HUP $MAINPID
ExecStartpre=/bin/mkdir -p /var/tmp/yrmcds
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
