------------------------------------------------------------ revno: 75 committer: Dimitri John Ledkov <[email protected]> branch nick: upstart-jobs timestamp: Mon 2014-05-05 12:09:46 +0100 message: auto update added: lib/systemd/system/cups.path lib/systemd/system/cups.service lib/systemd/system/cups.socket modified: etc/init.d/cups etc/init.d/jetty
-- 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/cups' --- etc/init.d/cups 2014-04-09 00:24:49 +0000 +++ etc/init.d/cups 2014-05-05 11:09:46 +0000 @@ -31,11 +31,6 @@ mkdir -p /var/run/cups/certs [ -x /sbin/restorecon ] && /sbin/restorecon -R /var/run/cups -# Read configuration variable file if it is present -if [ -r /etc/default/cups ]; then - . /etc/default/cups -fi - # Define LSB log_* functions. # Depend on lsb-base (>= 3.2-14) to ensure that this file is present # and status_of_proc is working. @@ -63,13 +58,6 @@ log_daemon_msg "Starting $DESC" "$NAME" mkdir -p `dirname "$PIDFILE"` - if [ "$LOAD_LP_MODULE" = "yes" -a -f /usr/lib/cups/backend/parallel \ - -a -f /proc/devices -a -f /proc/modules -a -x /sbin/modprobe ]; then - modprobe -q -b lp || true - modprobe -q -b ppdev || true - modprobe -q -b parport_pc || true - fi - start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" --exec $DAEMON status=$? [ $status = 0 ] && coldplug_usb_printers === modified file 'etc/init.d/jetty' --- etc/init.d/jetty 2014-04-09 00:24:49 +0000 +++ etc/init.d/jetty 2014-05-05 11:09:46 +0000 @@ -119,8 +119,9 @@ # defined in /etc/default/jetty). Should contain a list of space separated directories. JDK_DIRS=" /usr/lib/jvm/default-java \ - /usr/lib/jvm/java-1.7.0-openjdk-* \ - /usr/lib/jvm/java-1.6.0-openjdk-* \ + /usr/lib/jvm/java-1.8.0-openjdk-* \ + /usr/lib/jvm/java-1.7.0-openjdk-* \ + /usr/lib/jvm/java-1.6.0-openjdk-* \ /usr/lib/jvm/java-6-sun \ /usr/lib/jvm/java-6-openjdk \ /usr/lib/jvm/java-1.5.0-sun \ @@ -198,7 +199,7 @@ WEBAPPDIR="$JETTY_HOME/webapps" BOOTSTRAP_CLASS=org.mortbay.jetty.start.daemon.Bootstrap JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$START_JAR:$START_DAEMON_JAR:$JAVA_HOME/lib/tools.jar" -ROTATELOGS=/usr/sbin/rotatelogs +ROTATELOGS=/usr/bin/rotatelogs HOSTNAME=$(uname -n) ################################################## === added file 'lib/systemd/system/cups.path' --- lib/systemd/system/cups.path 1970-01-01 00:00:00 +0000 +++ lib/systemd/system/cups.path 2014-05-05 11:09:46 +0000 @@ -0,0 +1,8 @@ +[Unit] +Description=CUPS Printer Service Spool + +[Path] +PathExistsGlob=/var/spool/cups/d* + +[Install] +WantedBy=multi-user.target === added file 'lib/systemd/system/cups.service' --- lib/systemd/system/cups.service 1970-01-01 00:00:00 +0000 +++ lib/systemd/system/cups.service 2014-05-05 11:09:46 +0000 @@ -0,0 +1,12 @@ +[Unit] +Description=CUPS Printing Service +Documentation=man:cupsd(8) man:cupsd.conf(5) +Requires=cups.socket + +[Service] +ExecStart=/usr/sbin/cupsd -f +PrivateTmp=true + +[Install] +Also=cups.socket cups.path +WantedBy=printer.target === added file 'lib/systemd/system/cups.socket' --- lib/systemd/system/cups.socket 1970-01-01 00:00:00 +0000 +++ lib/systemd/system/cups.socket 2014-05-05 11:09:46 +0000 @@ -0,0 +1,9 @@ +[Unit] +Description=CUPS Printing Service Sockets + +[Socket] +ListenStream=/var/run/cups/cups.sock +BindIPv6Only=ipv6-only + +[Install] +WantedBy=sockets.target
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
