------------------------------------------------------------ revno: 68 committer: Dimitri John Ledkov <[email protected]> branch nick: upstart-jobs timestamp: Fri 2014-04-25 12:16:07 +0100 message: auto update removed: etc/init.d/jenkins etc/init.d/jenkins-slave etc/init.d/likewise etc/init.d/lwsmd etc/init.d/rdsserver etc/init/cloud-installer.conf etc/init/jenkins-slave.conf etc/init/jenkins.conf modified: usr/share/upstart/sessions/unity8-mir.conf usr/share/upstart/sessions/unity8.conf
-- 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
=== removed file 'etc/init.d/jenkins' --- etc/init.d/jenkins 2014-04-09 00:24:49 +0000 +++ etc/init.d/jenkins 1970-01-01 00:00:00 +0000 @@ -1,240 +0,0 @@ -#!/bin/bash -# /etc/init.d/jenkins -# debian-compatible jenkins startup script. -# Amelia A Lewis <[email protected]> -# -### BEGIN INIT INFO -# Provides: jenkins -# 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: Start jenkins at boot time -# Description: Controls the jenkins continuous integration engine. -### END INIT INFO - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -DESC="Jenkins Continuous Integration Server" -NAME=jenkins -SCRIPTNAME=/etc/init.d/$NAME - -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -#DAEMON=$JENKINS_SH -DAEMON=/usr/bin/daemon -DAEMON_ARGS="--name=$NAME --inherit --env=JENKINS_HOME=$JENKINS_HOME --output=$JENKINS_LOG --pidfile=$PIDFILE" - -SU=/bin/su - -# Exit if the package is not installed -[ -x "$DAEMON" ] || (echo "daemon package not installed" && exit 0) - -# Exit if not supposed to run standalone -[ "$RUN_STANDALONE" = "false" ] && echo "Not configured to run standalone" && exit 0 - -# load environments -if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG LANGUAGE -elif [ -r /etc/environment ]; then - . /etc/environment - export LANG LANGUAGE -fi - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# Make sure we run as root, since setting the max open files through -# ulimit requires root access -if [ `id -u` -ne 0 ]; then - echo "The $NAME init script can only be run as root" - exit 1 -fi - - -check_tcp_port() { - local service=$1 - local assigned=$2 - local default=$3 - - if [ -n "$assigned" ]; then - port=$assigned - else - port=$default - fi - - count=`netstat --listen --numeric-ports | grep \:$port[[:space:]] | grep -c . ` - - if [ $count -ne 0 ]; then - echo "The selected $service port ($port) seems to be in use by another program " - echo "Please select another port to use for $NAME" - return 1 - fi -} - -# -# Function that starts the daemon/service -# -do_start() -{ - # the default location is /var/run/jenkins/jenkins.pid but the parent directory needs to be created - mkdir `dirname $PIDFILE` > /dev/null 2>&1 || true - chown $JENKINS_USER `dirname $PIDFILE` - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - $DAEMON $DAEMON_ARGS --running && return 1 - - # Verify that the jenkins port is not already in use, winstone does not exit - # even for BindException - check_tcp_port "http" "$HTTP_PORT" "8080" || return 1 - - # If the var MAXOPENFILES is enabled in /etc/default/jenkins then set the max open files to the - # proper value - if [ -n "$MAXOPENFILES" ]; then - [ "$VERBOSE" != no ] && echo Setting up max open files limit to $MAXOPENFILES - ulimit -n $MAXOPENFILES - fi - - # --user in daemon doesn't prepare environment variables like HOME, USER, LOGNAME or USERNAME, - # so we let su do so for us now - $SU -l $JENKINS_USER --shell=/bin/bash -c "$DAEMON $DAEMON_ARGS -- $JAVA $JAVA_ARGS -jar $JENKINS_WAR $JENKINS_ARGS" || return 2 -} - - -# -# Verify that all jenkins processes have been shutdown -# and if not, then do killall for them -# -get_running() -{ - return `ps -U $JENKINS_USER --no-headers -f | egrep -e '(java|daemon)' | grep -c . ` -} - -force_stop() -{ - get_running - if [ $? -ne 0 ]; then - killall -u $JENKINS_USER java daemon || return 3 - fi -} - -# Get the status of the daemon process -get_daemon_status() -{ - $DAEMON $DAEMON_ARGS --running || return 1 -} - - -# -# 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 - get_daemon_status - case "$?" in - 0) - $DAEMON $DAEMON_ARGS --stop || return 2 - # wait for the process to really terminate - for n in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do - sleep 1 - $DAEMON $DAEMON_ARGS --running || break - done - if get_daemon_status; then - force_stop || return 3 - fi - ;; - *) - force_stop || return 3 - ;; - esac - - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return 0 -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - 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 - ;; - status) - get_daemon_status - case "$?" in - 0) - echo "$DESC is running with the pid `cat $PIDFILE`" - rc=0 - ;; - *) - get_running - procs=$? - if [ $procs -eq 0 ]; then - echo -n "$DESC is not running" - if [ -f $PIDFILE ]; then - echo ", but the pidfile ($PIDFILE) still exists" - rc=1 - else - echo - rc=3 - fi - - else - echo "$procs instances of jenkins are running at the moment" - echo "but the pidfile $PIDFILE is missing" - rc=0 - fi - - exit $rc - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -exit 0 === removed file 'etc/init.d/jenkins-slave' --- etc/init.d/jenkins-slave 2014-04-09 00:24:49 +0000 +++ etc/init.d/jenkins-slave 1970-01-01 00:00:00 +0000 @@ -1,211 +0,0 @@ -#!/bin/bash -# /etc/init.d/jenkins-slave -# debian-compatible jenkins-slave startup script. -# Based on work by Amelia A Lewis <[email protected]> -# -### BEGIN INIT INFO -# Provides: jenkins-slave -# 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: Start jenkins-slave at boot time -# Description: Controls the jenkins slave. -### END INIT INFO - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -DESC="Jenkins Slave" -NAME=jenkins-slave -SCRIPTNAME=/etc/init.d/$NAME - -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -DAEMON=/usr/bin/daemon -DAEMON_ARGS="--name=$NAME --inherit --output=$JENKINS_SLAVE_LOG --pidfile=$PIDFILE" - -SU=/bin/su - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Only run this daemon if JENKINS_URL is specified. -[ -n "$JENKINS_URL" ] || exit 0 - -# load environments -if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG LANGUAGE -elif [ -r /etc/environment ]; then - . /etc/environment - export LANG LANGUAGE -fi - -VERBOSE=no - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# Make sure we run as root, since setting the max open files through -# ulimit requires root access -if [ `id -u` -ne 0 ]; then - echo "The $NAME init script can only be run as root" - exit 1 -fi - -# -# Function that starts the daemon/service -# -do_start() -{ - # the default location is /var/run/jenkins/jenkins.pid but the parent directory needs to be created - mkdir `dirname $PIDFILE` > /dev/null 2>&1 || true - chown $JENKINS_USER `dirname $PIDFILE` - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - $DAEMON $DAEMON_ARGS --running && return 1 - - # If the var MAXOPENFILES is enabled in /etc/default/jenkins then set the max open files to the - # proper value - if [ -n "$MAXOPENFILES" ]; then - [ "$VERBOSE" != no ] && echo Setting up max open files limit to $MAXOPENFILES - ulimit -n $MAXOPENFILES - fi - - # Ensure that slave.jar has been downloaded from JENKINS_URL - $JENKINS_ROOT/bin/download-slave.sh $JENKINS_URL > /dev/null 2>&1 || return 2 - - # --user in daemon doesn't prepare environment variables like HOME, USER, LOGNAME or USERNAME, - # so we let su do so for us now - $SU -l $JENKINS_USER --shell=/bin/bash -c "$DAEMON $DAEMON_ARGS -- $JAVA $JAVA_ARGS -jar $JENKINS_RUN/slave.jar $JENKINS_ARGS" || return 2 -} - - -# -# Verify that all jenkins processes have been shutdown -# and if not, then do killall for them -# -get_running() -{ - return `ps -U $JENKINS_USER --no-headers -f | egrep -e '(slave)' | grep -c . ` -} - -force_stop() -{ - get_running - if [ $? -ne 0 ]; then - killall -u $JENKINS_USER java daemon || return 3 - fi -} - -# Get the status of the daemon process -get_daemon_status() -{ - $DAEMON $DAEMON_ARGS --running || return 1 -} - - -# -# 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 - get_daemon_status - case "$?" in - 0) - $DAEMON $DAEMON_ARGS --stop || return 2 - # wait for the process to really terminate - for n in 1 2 3 4 5; do - sleep 1 - $DAEMON $DAEMON_ARGS --running || break - done - if get_daemon_status; then - force_stop || return 3 - fi - ;; - *) - force_stop || return 3 - ;; - esac - - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return 0 -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) log_end_msg 0 ;; - 2) log_end_msg 1 ;; - esac - ;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - 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 - ;; - status) - get_daemon_status - case "$?" in - 0) echo "$DESC is running with the pid `cat $PIDFILE`";; - *) - get_running - procs=$? - if [ $procs -eq 0 ]; then - echo -n "$DESC is not running" - if [ -f $PIDFILE ]; then - echo ", but the pidfile ($PIDFILE) still exists" - else - echo - fi - - else - echo "$procs instances of jenkins are running at the moment" - echo "but the pidfile $PIDFILE is missing" - fi - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -exit 0 === removed file 'etc/init.d/likewise' --- etc/init.d/likewise 2014-04-09 00:24:49 +0000 +++ etc/init.d/likewise 1970-01-01 00:00:00 +0000 @@ -1,36 +0,0 @@ -#! /bin/sh -# ex: set tabstop=4 expandtab shiftwidth=4: -# -# Copyright (c) Likewise Software. All rights reserved. -# -#LWI_STARTUP_TYPE_REDHAT### -#LWI_STARTUP_TYPE_REDHAT# chkconfig: 35 21 9 -#LWI_STARTUP_TYPE_REDHAT# description: Start Likewise Open services -#LWI_STARTUP_TYPE_REDHAT### -#LWI_STARTUP_TYPE_REDHAT# -#LWI_STARTUP_TYPE_SUSE### BEGIN INIT INFO -#LWI_STARTUP_TYPE_SUSE# Provides: likewise -#LWI_STARTUP_TYPE_SUSE# Required-Start: $network $remote_fs lwsmd -#LWI_STARTUP_TYPE_SUSE# Required-Stop: -#LWI_STARTUP_TYPE_SUSE# Default-Start: 3 5 -#LWI_STARTUP_TYPE_SUSE# Default-Stop: -#LWI_STARTUP_TYPE_SUSE# Description: Start Likewise Open services -#LWI_STARTUP_TYPE_SUSE### END INIT INFO -#LWI_STARTUP_TYPE_DEBIAN### BEGIN INIT INFO -#LWI_STARTUP_TYPE_DEBIAN# Provides: likewise -#LWI_STARTUP_TYPE_DEBIAN# Required-Start: $network $remote_fs $syslog lwsmd -#LWI_STARTUP_TYPE_DEBIAN# Required-Stop: -#LWI_STARTUP_TYPE_DEBIAN# X-Start-Before: cron -#LWI_STARTUP_TYPE_DEBIAN# X-Start-After: -#LWI_STARTUP_TYPE_DEBIAN# Default-Start: 2 3 4 5 -#LWI_STARTUP_TYPE_DEBIAN# Default-Stop: -#LWI_STARTUP_TYPE_DEBIAN# Description: Start Likewise Open services -#LWI_STARTUP_TYPE_DEBIAN### END INIT INFO -#LWI_STARTUP_TYPE_FREEBSD# PROVIDE: likewise -#LWI_STARTUP_TYPE_FREEBSD# REQUIRE: NETWORKING lwsmd -#LWI_STARTUP_TYPE_FREEBSD# BEFORE: LOGIN - -PREFIX="/usr" -SERVICE_NAME="likewise" - -. /usr/libexec/likewise-open/init-likewise.sh === removed file 'etc/init.d/lwsmd' --- etc/init.d/lwsmd 2014-04-09 00:24:49 +0000 +++ etc/init.d/lwsmd 1970-01-01 00:00:00 +0000 @@ -1,67 +0,0 @@ -#! /bin/sh -# ex: set tabstop=4 expandtab shiftwidth=4: -# -# Copyright (c) Likewise Software. All rights reserved. -# -#LWI_STARTUP_TYPE_REDHAT### -#LWI_STARTUP_TYPE_REDHAT# chkconfig: 35 17 9 -#LWI_STARTUP_TYPE_REDHAT# description: Start and Stop Likewise Service Manager -#LWI_STARTUP_TYPE_REDHAT### -#LWI_STARTUP_TYPE_REDHAT# -#LWI_STARTUP_TYPE_SUSE### BEGIN INIT INFO -#LWI_STARTUP_TYPE_SUSE# Provides: lwsmd -#LWI_STARTUP_TYPE_SUSE# Required-Start: $network $syslog -#LWI_STARTUP_TYPE_SUSE# Required-Stop: -#LWI_STARTUP_TYPE_SUSE# Default-Start: 3 5 -#LWI_STARTUP_TYPE_SUSE# Default-Stop: 0 1 2 6 -#LWI_STARTUP_TYPE_SUSE# Description: Start and Stop Likewise Service Manager -#LWI_STARTUP_TYPE_SUSE### END INIT INFO -#LWI_STARTUP_TYPE_DEBIAN### BEGIN INIT INFO -#LWI_STARTUP_TYPE_DEBIAN# Provides: lwsmd -#LWI_STARTUP_TYPE_DEBIAN# Required-Start: -#LWI_STARTUP_TYPE_DEBIAN# Required-Stop: -#LWI_STARTUP_TYPE_DEBIAN# Default-Start: 2 3 4 5 -#LWI_STARTUP_TYPE_DEBIAN# Default-Stop: 0 1 6 -#LWI_STARTUP_TYPE_DEBIAN# Description: Start and Stop Likewise Service Manager -#LWI_STARTUP_TYPE_DEBIAN### END INIT INFO -#LWI_STARTUP_TYPE_FREEBSD# PROVIDE: lwsmd -#LWI_STARTUP_TYPE_FREEBSD# REQUIRE: NETWORKING -#LWI_STARTUP_TYPE_FREEBSD# BEFORE: LOGIN - -PROG_DESC="Likewise Service Manager" -PROG_BIN=/usr/sbin/lwsmd -PROG_ARGS="--start-as-daemon --syslog" -PIDFILE= -SCRIPTNAME="lwsmd" -STARTHOOK="fix_locale" - -lookup_user_locale() -{ - . /etc/sysconfig/language - printf 'LANG=%q; export LANG\n' "$RC_LANG" - printf 'LC_ALL=%q; export LC_ALL\n' "$RC_LC_ALL" - printf 'LC_CTYPE=%q; export LC_CTYPE\n' "$RC_LC_CTYPE" -} - -fix_locale() -{ - if [ "$LC_ALL" = "POSIX" ] - then - unset LC_ALL - export LC_ALL - fi - if type locale >/dev/null && - locale | grep LC_CTYPE | grep POSIX >/dev/null; then - if [ -f /etc/sysconfig/language ]; then - eval "`lookup_user_locale`" - elif [ -f /etc/default/locale ]; then - . /etc/default/locale - export LANG - fi - elif [ -z "$LANG" ]; then - LANG="en_US.UTF-8" - export LANG - fi -} - -. /usr/libexec/likewise-open/init-base.sh === removed file 'etc/init.d/rdsserver' --- etc/init.d/rdsserver 2014-04-09 00:24:49 +0000 +++ etc/init.d/rdsserver 1970-01-01 00:00:00 +0000 @@ -1,155 +0,0 @@ -#! /bin/sh - -### BEGIN INIT INFO -# Provides: resaraserver -# Required-Start: $remote_fs $syslog samba4 -# Required-Stop: $remote_fs $syslog samba4 -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start the Resara Server daemon -# Description: Provides an administrative interface for Samba 4 and other services -### END INIT INFO - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/rdsd -NAME=rdsd -DESC="RDS daemon" -LABEL=rdsd - -test -x $DAEMON || exit 0 - -LOGDIR=/var/log/rdsd -PIDFILE=/var/run/$NAME.pid -DODTIME=1 # Time to wait for the server to die, in seconds - # If this value is set too low you might not - # let some servers to die gracefully and - # 'restart' will not work - -# Include rdsd defaults if available -if [ -f /etc/default/rdsd ] ; then - . /etc/default/rdsd -fi - -running_pid() -{ - # Check if a given process pid's cmdline matches a given name - pid=$1 - name=$2 - [ -z "$pid" ] && return 1 - [ ! -d /proc/$pid ] && return 1 - cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1` - # Is this the expected child? - [ "$cmd" != "$name" ] && return 1 - return 0 -} - -running() -{ -# Check if the process is running looking at /proc -# (works for all users) - - # No pidfile, probably no daemon present - [ ! -f "$PIDFILE" ] && return 1 - # Obtain the pid and check it against the binary name - pid=`cat $PIDFILE` - running_pid $pid $DAEMON || return 1 - return 0 -} - -force_stop() { -# Forcefully kill the process - [ ! -f "$PIDFILE" ] && return - if running ; then - kill -15 $pid - # Is it really dead? - [ -n "$DODTIME" ] && sleep "$DODTIME"s - if running ; then - kill -9 $pid - [ -n "$DODTIME" ] && sleep "$DODTIME"s - if running ; then - echo "Cannot kill $LABEL (pid=$pid)!" - exit 1 - fi - fi - fi - rm -f $PIDFILE - return 0 -} - -case "$1" in - start) - echo -n "Starting $DESC" - if running ; then - echo ": Already running" - exit 0 - fi - echo "..." - $DAEMON $DAEMON_OPTS - if running ; then - echo "$NAME" - else - echo "ERROR" - fi - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - --exec $DAEMON - echo "$NAME." - ;; - force-stop) - echo -n "Forcefully stopping $DESC: " - force_stop - if ! running ; then - echo "$NAME" - else - echo "ERROR" - fi - ;; - #reload) - # - # If the daemon can reload its config files on the fly - # for example by sending it SIGHUP, do it here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this a do-nothing entry. - # - # echo "Reloading $DESC configuration files." - # start-stop-daemon --stop --signal 1 --quiet --pidfile \ - # $PIDFILE --exec $DAEMON - #;; - force-reload) - # - # If the "reload" option is implemented, move the "force-reload" - # option to the "reload" entry above. If not, "force-reload" is - # just the same as "restart" except that it does nothing if the - # daemon isn't already running. - # check wether $DAEMON is running. If so, restart - start-stop-daemon --stop --test --quiet --pidfile \ - $PIDFILE --exec $DAEMON \ - && $0 restart \ - || exit 0 - ;; - restart) - echo "Restarting $DESC..." - running && $0 stop - $0 start - ;; - status) - echo -n "$DESC is " - if running ; then - echo "running" - else - echo "not running." - exit 1 - fi - ;; - *) - N=/etc/init.d/$NAME - # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2 - exit 1 - ;; -esac - -exit 0 === removed file 'etc/init/cloud-installer.conf' --- etc/init/cloud-installer.conf 2014-03-31 11:07:46 +0000 +++ etc/init/cloud-installer.conf 1970-01-01 00:00:00 +0000 @@ -1,26 +0,0 @@ -description "Cloud install" -author "Robert Ayres <[email protected]>" - -start on (local-filesystems and stopped rc RUNLEVEL=[2345]) -stop on runlevel [!2345] - -respawn - -script - . /etc/default/locale - export LANG LANGUAGE - - INSTALL_USER=$(debconf-get-selections \ - | awk -F "\t" '($1 == "cloud-install-multi") && ($2 == "cloud-installer/install-user") { print $4 }') - - if [ ! -e /etc/.cloud-installed ]; then - export HOME=/root - user=root - cmd=/usr/bin/cloud-install - else - export HOME=/home/$INSTALL_USER - user=$INSTALL_USER - cmd=/usr/bin/cloud-status - fi - exec /sbin/rungetty -u "$user" -g "$user" -w "$HOME" tty1 $cmd -end script === removed file 'etc/init/jenkins-slave.conf' --- etc/init/jenkins-slave.conf 2013-11-18 12:42:03 +0000 +++ etc/init/jenkins-slave.conf 1970-01-01 00:00:00 +0000 @@ -1,19 +0,0 @@ -description "Jenkins CI Slave Agent" -author "James Page <[email protected]>" - -start on runlevel [2345] -stop on runlevel [!2345] - -pre-start script - [ -r /etc/default/jenkins-slave ] && . /etc/default/jenkins-slave - [ -n "$JENKINS_URL" ] || { stop; exit 0; } - mkdir $JENKINS_RUN > /dev/null 2>&1 || true - chown -R $JENKINS_USER $JENKINS_RUN || true - $JENKINS_ROOT/bin/download-slave.sh $JENKINS_URL -end script - -script - [ -r /etc/default/jenkins-slave ] && . /etc/default/jenkins-slave - exec start-stop-daemon --start -c $JENKINS_USER --exec $JAVA --name jenkins-slave \ - -- $JAVA_ARGS -jar $JENKINS_RUN/slave.jar $JENKINS_ARGS -end script === removed file 'etc/init/jenkins.conf' --- etc/init/jenkins.conf 2013-11-18 12:42:03 +0000 +++ etc/init/jenkins.conf 1970-01-01 00:00:00 +0000 @@ -1,22 +0,0 @@ -description "Jenkins Continuous Integration Server" -author "James Page <[email protected]>" - -start on runlevel [2345] -stop on runlevel [!2345] - -limit nofile 8192 8192 - -pre-start script - [ -r /etc/default/jenkins ] && . /etc/default/jenkins - test -f $JENKINS_WAR || { stop ; exit 0; } - $JENKINS_ROOT/bin/maintain-plugins.sh - mkdir $JENKINS_RUN > /dev/null 2>&1 || true - chown -R $JENKINS_USER $JENKINS_RUN || true -end script - -script - [ -r /etc/default/jenkins ] && . /etc/default/jenkins - export JENKINS_HOME - exec start-stop-daemon --start -c $JENKINS_USER --exec $JAVA --name jenkins \ - -- $JAVA_ARGS -jar $JENKINS_WAR $JENKINS_ARGS --logfile=$JENKINS_LOG -end script === modified file 'usr/share/upstart/sessions/unity8-mir.conf' --- usr/share/upstart/sessions/unity8-mir.conf 2014-04-04 11:08:30 +0000 +++ usr/share/upstart/sessions/unity8-mir.conf 2014-04-25 11:16:07 +0000 @@ -1,6 +1,6 @@ description "Unity Shell v8 on Mir" -emits scope-ui-starting +emits scope-ui-starting indicator-services-start start on xsession SESSION=unity8-mir and started dbus stop on desktop-end @@ -47,6 +47,7 @@ fi initctl emit scope-ui-starting + initctl emit indicator-services-start & end script exec ${BINARY:-unity8} $ARGS === modified file 'usr/share/upstart/sessions/unity8.conf' --- usr/share/upstart/sessions/unity8.conf 2014-03-31 11:07:46 +0000 +++ usr/share/upstart/sessions/unity8.conf 2014-04-25 11:16:07 +0000 @@ -1,7 +1,7 @@ description "Unity Shell v8" author "Ricardo Mendoza <[email protected]>" -emits scope-ui-starting +emits scope-ui-starting indicator-services-start start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus stop on desktop-end @@ -42,6 +42,7 @@ fi initctl emit scope-ui-starting + initctl emit indicator-services-start end script exec ${BINARY:-unity8} $ARGS
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
