------------------------------------------------------------
revno: 72
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Tue 2014-04-29 12:14:09 +0100
message:
auto update
removed:
etc/init/systemd-logind.conf
added:
etc/init.d/udev-finish
lib/systemd/system/gdm.service
lib/systemd/system/redis-server.service
lib/systemd/system/sysinit.target.wants/udev-finish.service@
lib/systemd/system/udev-finish.service
modified:
etc/init.d/netplan
etc/init.d/thin
etc/init.d/udev
etc/init/udev-finish.conf
lib/systemd/systemd-udevd
usr/share/upstart/sessions/gpg-agent.conf
usr/share/upstart/sessions/im-config.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
=== modified file 'etc/init.d/netplan'
--- etc/init.d/netplan 2014-04-09 00:24:49 +0000
+++ etc/init.d/netplan 2014-04-29 11:14:09 +0000
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
### BEGIN INIT INFO
# Provides: netplan
# Required-Start: $remote_fs $network $syslog
@@ -8,48 +8,31 @@
# Short-Description: Netplan calendar service.
# Description: The server part of plan.
### END INIT INFO
+
+if [ true != "$INIT_D_SCRIPT_SOURCED" ] ; then
+ if [ -e /lib/init/init-d-script ] ; then
+ script=/lib/init/init-d-script
+ else
+ # Use local copy to ease backporting
+ script=/usr/share/netplan/init-d-script
+ fi
+ set "$0" "$@"; INIT_D_SCRIPT_SOURCED=true . $script
+fi
+
# Set ENABLED=0 to disable, ENABLED=1 to enable.
ENABLED=0
DAEMON=/usr/sbin/netplan
-DAEMONOPTS=-s
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
+DESC="plan appointment daemon"
+PIDFILE=none
# Load local overrides
if [ -f /etc/default/netplan ] ; then
. /etc/default/netplan
fi
-test -f $DAEMON || exit 0
-
if [ "$ENABLED" = 0 ]
then
echo "Netplan daemon not enabled in /etc/init.d/netplan."
exit 0
fi
-
-case "$1" in
- start)
- echo -n "Starting plan appointment daemon: netplan"
- start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMONOPTS
- echo "."
- ;;
- stop)
- echo -n "Stopping plan appointment daemon: netplan"
- start-stop-daemon --stop --quiet --exec $DAEMON -- $DAEMONOPTS
- echo "."
- ;;
- restart | force-reload)
- echo -n "Stopping plan appointment daemon: netplan"
- start-stop-daemon --stop --quiet --exec $DAEMON -- $DAEMONOPTS
- echo "."
- echo -n "Restarting plan appointment daemon: netplan"
- start-stop-daemon --start --quiet --exec $DAEMON -- $DAEMONOPTS
- echo "."
- ;;
- *)
- echo "Usage: /etc/init.d/plan {start|stop|restart|force-reload}"
- exit 1
- ;;
-esac
-exit 0
=== modified file 'etc/init.d/thin'
--- etc/init.d/thin 2014-04-09 00:24:49 +0000
+++ etc/init.d/thin 2014-04-29 11:14:09 +0000
@@ -22,14 +22,14 @@
run_action() {
ACTION="$1"
- if [ -x /usr/bin/ruby1.9.1 ]; then
- /usr/bin/ruby1.9.1 $DAEMON $ACTION --all /etc/thin1.9.1
- fi
-
if [ -x /usr/bin/ruby2.0 ]; then
/usr/bin/ruby2.0 $DAEMON $ACTION --all /etc/thin2.0
fi
+ if [ -x /usr/bin/ruby2.1 ]; then
+ /usr/bin/ruby2.1 $DAEMON $ACTION --all /etc/thin2.1
+ fi
+
}
case "$1" in
=== modified file 'etc/init.d/udev'
--- etc/init.d/udev 2014-04-09 00:24:49 +0000
+++ etc/init.d/udev 2014-04-29 11:14:09 +0000
@@ -174,9 +174,6 @@
# set the SELinux context for devices created in the initramfs
[ -x /sbin/restorecon ] && /sbin/restorecon -R /dev
- # /dev/null must be created before udevd is started
- /lib/udev/create_static_nodes || true
-
log_daemon_msg "Starting the hotplug events dispatcher" "udevd"
if udevd --daemon; then
log_end_msg $?
=== added file 'etc/init.d/udev-finish'
--- etc/init.d/udev-finish 1970-01-01 00:00:00 +0000
+++ etc/init.d/udev-finish 2014-04-29 11:14:09 +0000
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides: udev-finish
+# Required-Start: udev $local_fs
+# Required-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: Copy rules generated while the root was ro
+### END INIT INFO
+
+PATH="/sbin:/bin"
+
+case "$1" in
+ start) ;;
+ stop|restart|force-reload) exit 0 ;;
+ *) echo "Usage: $0 {start|stop|restart|force-reload}" >&2; exit 1 ;;
+esac
+
+exec /lib/udev/udev-finish
+
=== removed file 'etc/init/systemd-logind.conf'
--- etc/init/systemd-logind.conf 2014-04-15 11:09:43 +0000
+++ etc/init/systemd-logind.conf 1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-description "SystemD login management service"
-
-start on started dbus
-stop on stopping dbus
-
-respawn
-
-env SYSTEMD_LOG_TARGET=syslog
-
-pre-start script
- # only start if PAM module is actually available, not if libpam-systemd is
- # removed but not purged
- [ -e /lib/*/security/pam_systemd.so ] || { stop; exit 0; }
-
- # this is being done by systemd or mountall usually, but not during
- # upgrades from earlier distro releases
- if ! mountpoint -q /sys/fs/cgroup; then
- mount -t tmpfs -o uid=0,gid=0,mode=0755,size=1024 none /sys/fs/cgroup
- fi
- mkdir -p /run/systemd
- # mounting the cgroup does not work in LXC, there it uses cgmanager
- if [ ! -e /run/container_type ] && ! mountpoint -q /sys/fs/cgroup/systemd; then
- mkdir -p /sys/fs/cgroup/systemd
- mount -t cgroup -o nosuid,noexec,nodev,none,name=systemd systemd /sys/fs/cgroup/systemd
- fi
-end script
-
-script
- # Don't use the limit stanza as failure to set the limit (unprivileged
- # containers for example) causes a complete failure to start the job.
- ulimit -S -n 16384 || true
- ulimit -H -n 16384 || true
-
- exec /lib/systemd/systemd-logind
-end script
=== modified file 'etc/init/udev-finish.conf'
--- etc/init/udev-finish.conf 2013-11-18 12:42:03 +0000
+++ etc/init/udev-finish.conf 2014-04-29 11:14:09 +0000
@@ -21,10 +21,5 @@
fi
# Copy any rules generated while the root filesystem was read-only
- for file in /run/udev/tmp-rules--*
- do
- [ -e "$file" ] || continue
- cat "$file" >> "/etc/udev/rules.d/${file##*tmp-rules--}"
- rm -f "$file"
- done
+ /lib/udev/udev-finish
end script
=== added file 'lib/systemd/system/gdm.service'
--- lib/systemd/system/gdm.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/gdm.service 2014-04-29 11:14:09 +0000
@@ -0,0 +1,15 @@
+[Unit]
+Description=GNOME Display Manager
[email protected] plymouth-quit.service
+After=systemd-user-sessions.service [email protected] plymouth-quit.service
+
+[Service]
+ExecStart=/usr/sbin/gdm
+Restart=always
+IgnoreSIGPIPE=no
+BusName=org.gnome.DisplayManager
+StandardOutput=syslog
+StandardError=inherit
+
+[Install]
+Alias=display-manager.service
=== added file 'lib/systemd/system/redis-server.service'
--- lib/systemd/system/redis-server.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/redis-server.service 2014-04-29 11:14:09 +0000
@@ -0,0 +1,12 @@
+[Unit]
+Description=Advanced key-value store
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/redis-server /etc/redis/redis.conf
+ExecStop=/usr/bin/redis-cli shutdown
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
=== added symlink 'lib/systemd/system/sysinit.target.wants/udev-finish.service'
=== target is u'../udev-finish.service'
=== added file 'lib/systemd/system/udev-finish.service'
--- lib/systemd/system/udev-finish.service 1970-01-01 00:00:00 +0000
+++ lib/systemd/system/udev-finish.service 2014-04-29 11:14:09 +0000
@@ -0,0 +1,9 @@
+[Unit]
+Description=Copy rules generated while the root was ro
+DefaultDependencies=no
+After=systemd-udevd.service systemd-udev-settle.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/lib/udev/udev-finish
=== modified file 'lib/systemd/systemd-udevd'
Binary files lib/systemd/systemd-udevd 2014-04-12 11:09:57 +0000 and lib/systemd/systemd-udevd 2014-04-29 11:14:09 +0000 differ
=== modified file 'usr/share/upstart/sessions/gpg-agent.conf'
--- usr/share/upstart/sessions/gpg-agent.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/gpg-agent.conf 2014-04-29 11:14:09 +0000
@@ -6,6 +6,7 @@
pre-start script
GNUPGHOME=$HOME/.gnupg
[ -d $GNUPGHOME ] || { stop; exit 0; }
+ [ -z "$GPG_AGENT_INFO" ] || { stop; exit 0; }
grep -qs '^[[:space:]]*use-agent' "$GNUPGHOME/gpg.conf" "$GNUPGHOME/options" || { stop; exit 0; }
=== modified file 'usr/share/upstart/sessions/im-config.conf'
--- usr/share/upstart/sessions/im-config.conf 2014-03-31 11:07:46 +0000
+++ usr/share/upstart/sessions/im-config.conf 2014-04-29 11:14:09 +0000
@@ -11,9 +11,6 @@
# source the first found configuration file
if [ -r "$IM_CONFIG_XINPUTRC_USR" ]; then
. $IM_CONFIG_XINPUTRC_USR
- elif [ -x /usr/bin/fcitx ]; then
- # Ubuntu Kylin special
- run_im fcitx
elif [ -r "$IM_CONFIG_XINPUTRC_SYS" ]; then
. $IM_CONFIG_XINPUTRC_SYS
fi
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
