------------------------------------------------------------
revno: 5
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: upstart-jobs
timestamp: Fri 2013-12-06 17:20:05 +0000
message:
auto update
removed:
etc/init/mtp-server-bootup.conf
etc/init/radosgw.conf
etc/init/samba4.conf
added:
etc/init/aptitude-robot.conf
etc/init/quasselcore.conf
etc/init/radosgw-instance.conf
etc/init/samba-ad-dc.conf
etc/init/ulogd2.conf
usr/share/upstart/sessions/indicator-application.conf
usr/share/upstart/sessions/indicator-datetime.conf
usr/share/upstart/sessions/indicator-location.conf
usr/share/upstart/sessions/indicator-power.conf
usr/share/upstart/sessions/indicator-session.conf
usr/share/upstart/sessions/indicator-sound.conf
usr/share/upstart/sessions/indicator-sync.conf
usr/share/upstart/sessions/scope-registry.conf
usr/share/upstart/sessions/unity-voice-service.conf
modified:
etc/init/boot-hooks/set-display-mir.conf
etc/init/kdm.conf
etc/init/lxc-net.conf
etc/init/mysql.conf
etc/init/plymouth-stop.conf
usr/share/upstart/sessions/application-click.conf
usr/share/upstart/sessions/application-legacy.conf
usr/share/upstart/sessions/dbus.conf
usr/share/upstart/sessions/gnome-session.conf
usr/share/upstart/sessions/mtp-server.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
=== added file 'etc/init/aptitude-robot.conf'
--- etc/init/aptitude-robot.conf 1970-01-01 00:00:00 +0000
+++ etc/init/aptitude-robot.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,7 @@
+# aptitude-robot - package choice management
+
+description "aptitude-robot: package choice management"
+
+start on static-network-up
+task
+exec aptitude-robot-session
=== modified file 'etc/init/boot-hooks/set-display-mir.conf'
--- etc/init/boot-hooks/set-display-mir.conf 2013-11-18 12:42:03 +0000
+++ etc/init/boot-hooks/set-display-mir.conf 2013-12-06 17:20:05 +0000
@@ -28,7 +28,7 @@
if [ ! -e "$FLAG" ]; then
# only enable on supported devices
case "$(getprop ro.product.device)" in
- grouper|maguro|mako|generic)
+ grouper|maguro|mako|manta|generic)
touch "$DISPLAY_MIR"
;;
esac
=== modified file 'etc/init/kdm.conf'
--- etc/init/kdm.conf 2013-11-18 12:42:03 +0000
+++ etc/init/kdm.conf 2013-12-06 17:20:05 +0000
@@ -30,7 +30,7 @@
# quit plymouth all the time. Note that sleeping appears necessary
# as the VT freeing is somewhat delayed and KDM would otherwise go
# to configured KVT+1 (if plymouth was using it).
- $(plymouth --quit && plymouth --wait && sleep 1) || :
+ $(plymouth quit && plymouth wait && sleep 1) || :
if [ "$RUNLEVEL" = S -o "$RUNLEVEL" = 1 ]
then
# Single-user mode
=== modified file 'etc/init/lxc-net.conf'
--- etc/init/lxc-net.conf 2013-11-18 12:42:03 +0000
+++ etc/init/lxc-net.conf 2013-12-06 17:20:05 +0000
@@ -20,9 +20,11 @@
[ "x$USE_LXC_BRIDGE" = "xtrue" ] || { stop; exit 0; }
+ use_iptables_lock="-w"
+ iptables -w -L -n 2>&1 > /dev/null || use_iptables_lock=""
cleanup() {
# dnsmasq failed to start, clean up the bridge
- iptables -t nat -D POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE || true
+ iptables $use_iptables_lock -t nat -D POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE || true
ifconfig ${LXC_BRIDGE} down || true
brctl delbr ${LXC_BRIDGE} || true
}
@@ -40,7 +42,7 @@
echo 1 > /proc/sys/net/ipv4/ip_forward
mkdir -p ${varrun}
ifconfig ${LXC_BRIDGE} ${LXC_ADDR} netmask ${LXC_NETMASK} up
- iptables -t nat -A POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE
+ iptables $use_iptables_lock -t nat -A POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE
LXC_DOMAIN_ARG=""
if [ -n "$LXC_DOMAIN" ]; then
@@ -57,8 +59,10 @@
ls /sys/class/net/${LXC_BRIDGE}/brif/* > /dev/null 2>&1 && exit 0;
if [ -d /sys/class/net/${LXC_BRIDGE} ]; then
+ use_iptables_lock="-w"
+ iptables -w -L -n 2>&1 > /dev/null || use_iptables_lock=""
ifconfig ${LXC_BRIDGE} down
- iptables -t nat -D POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE || true
+ iptables $use_iptables_lock -t nat -D POSTROUTING -s ${LXC_NETWORK} ! -d ${LXC_NETWORK} -j MASQUERADE || true
pid=`cat ${varrun}/dnsmasq.pid 2>/dev/null` && kill -9 $pid || true
rm -f ${varrun}/dnsmasq.pid
brctl delbr ${LXC_BRIDGE}
=== removed file 'etc/init/mtp-server-bootup.conf'
--- etc/init/mtp-server-bootup.conf 2013-11-18 12:42:03 +0000
+++ etc/init/mtp-server-bootup.conf 1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-description "MTP protocol server bootup"
-
-start on android
-stop on runlevel [06]
-
-emits android_usb-device-changed
-
-pre-start script
- if [ -x /usr/bin/setprop ]; then
- timeout=10
- # loop 10 times and then exit, if the property service
- # isnt up after 80 sec # it is likely not starting at all
- while [ ! -e /dev/socket/property_service ]; do
- sleep 8
- if [ "$timeout" -le 0 ]; then
- stop
- exit 0
- fi
- timeout=$(($timeout - 1))
- done
-
- OLDPROP="$(/usr/bin/getprop sys.usb.config)"
- MYPROP=mtp
- if ! echo $OLDPROP | grep -q mtp; then
- for prop in $(echo $OLDPROP | sed -e 's/\,/ /g'); do
- case $prop in
- adb)
- MYPROP="$MYPROP,adb"
- ;;
- esac
- done
- /usr/bin/setprop sys.usb.config "$MYPROP"
- fi
- fi
-
- initctl emit android_usb-device-changed
-end script
-
-
-post-stop script
- OLDPROP="$(/usr/bin/getprop sys.usb.config)"
- MYPROP=""
- for prop in $(echo $OLDPROP | sed -e 's/\,/ /g'); do
- case $prop in
- mtp)
- ;;
- *)
- MYPROP="$prop,$MYPROP"
- ;;
- esac
- done
- MYPROP=$(echo $MYPROP | sed -e 's/\,$//')
- /usr/bin/setprop sys.usb.config "$MYPROP"
- initctl emit android_usb-device-changed
-end script
=== modified file 'etc/init/mysql.conf'
--- etc/init/mysql.conf 2013-11-18 12:42:03 +0000
+++ etc/init/mysql.conf 2013-12-06 17:20:05 +0000
@@ -16,11 +16,32 @@
kill timeout 300
pre-start script
+ ## Fetch a particular option from mysql's invocation.
+ # Usage: void mysqld_get_param option
+ mysqld_get_param() {
+ /usr/sbin/mysqld --print-defaults \
+ | tr " " "\n" \
+ | grep -- "--$1" \
+ | tail -n 1 \
+ | cut -d= -f2
+ }
+
+ # priority can be overriden and "-s" adds output to stderr
+ ERR_LOGGER="logger -p daemon.err -t /etc/init/mysql.conf -i"
+
#Sanity checks
[ -r $HOME/my.cnf ]
[ -d /var/run/mysqld ] || install -m 755 -o mysql -g root -d /var/run/mysqld
/lib/init/apparmor-profile-load usr.sbin.mysqld
- LC_ALL=C BLOCKSIZE= df --portability /var/lib/mysql/. | tail -n 1 | awk '{ exit ($4<4096) }'
+
+ # check for diskspace shortage
+ datadir=`mysqld_get_param datadir`
+ BLOCKSIZE=`LC_ALL=C df --portability $datadir/. | tail -n 1 | awk '{print $4}'`
+ if [ $BLOCKSIZE -le 4096 ] ; then
+ echo "$0: ERROR: The partition with $datadir is too full!" >&2
+ echo "ERROR: The partition with $datadir is too full!" | $ERR_LOGGER
+ exit 1
+ fi
end script
exec /usr/sbin/mysqld
=== modified file 'etc/init/plymouth-stop.conf'
--- etc/init/plymouth-stop.conf 2013-11-18 12:42:03 +0000
+++ etc/init/plymouth-stop.conf 2013-12-06 17:20:05 +0000
@@ -20,7 +20,7 @@
pre-start script
case "$JOB" in
- gdm|kdm|lightdm|ubiquity|oem-config)
+ gdm|lightdm|ubiquity|oem-config)
exit 0
;;
*)
=== added file 'etc/init/quasselcore.conf'
--- etc/init/quasselcore.conf 1970-01-01 00:00:00 +0000
+++ etc/init/quasselcore.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,32 @@
+# quasselcore - distributed IRC client using a central core component
+#
+# This is the core component of Quassel. A modern,
+# cross-platform, distributed IRC client, meaning that one
+# (or multiple) client(s) can attach to and detach from this
+# central core. It's much like the popular combination
+# of screen and a text-based IRC client such as WeeChat.
+
+description "distributed IRC client using a central core component"
+author "Michael Marley <[email protected]>"
+
+start on (filesystem and net-device-up IFACE!=lo)
+stop on runlevel [!2345]
+
+setuid quasselcore
+setgid quassel
+
+chdir /var/lib/quassel
+env HOME=/var/lib/quassel
+
+respawn
+
+script
+ DATADIR="/var/lib/quassel"
+ LOGFILE="/var/log/quassel/core.log"
+ LOGLEVEL="Info"
+ PORT="4242"
+
+ test -f /etc/default/quasselcore && . /etc/default/quasselcore
+
+ exec quasselcore --configdir=$DATADIR --logfile=$LOGFILE --loglevel=$LOGLEVEL --port=$PORT
+end script
=== added file 'etc/init/radosgw-instance.conf'
--- etc/init/radosgw-instance.conf 1970-01-01 00:00:00 +0000
+++ etc/init/radosgw-instance.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,26 @@
+description "Ceph radosgw"
+
+start on radosgw
+stop on runlevel [!2345] or stopping radosgw-all
+
+respawn
+respawn limit 5 30
+
+limit nofile 8096 65536
+
+pre-start script
+ set -e
+ test -x /usr/bin/radosgw || { stop; exit 0; }
+ test -d "/var/lib/ceph/radosgw/${cluster:-ceph}-$id" || { stop; exit 0; }
+
+ install -d -m0755 /var/run/ceph
+end script
+
+instance ${cluster:-ceph}/$id
+export cluster
+export id
+
+# this breaks oneiric
+#usage "cluster = name of cluster (defaults to 'ceph'); id = mds instance id"
+
+exec /usr/bin/radosgw --cluster="${cluster:-ceph}" --id "$id" -f
=== removed file 'etc/init/radosgw.conf'
--- etc/init/radosgw.conf 2013-11-18 12:42:03 +0000
+++ etc/init/radosgw.conf 1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-description "Ceph radosgw"
-
-start on radosgw
-stop on runlevel [!2345] or stopping radosgw-all
-
-respawn
-respawn limit 5 30
-
-limit nofile 8096 65536
-
-pre-start script
- set -e
- test -x /usr/bin/radosgw || { stop; exit 0; }
- test -d "/var/lib/ceph/radosgw/${cluster:-ceph}-$id" || { stop; exit 0; }
-
- install -d -m0755 /var/run/ceph
-end script
-
-instance ${cluster:-ceph}/$id
-export cluster
-export id
-
-# this breaks oneiric
-#usage "cluster = name of cluster (defaults to 'ceph'); id = mds instance id"
-
-exec /usr/bin/radosgw --cluster="${cluster:-ceph}" --id "$id" -f
=== added file 'etc/init/samba-ad-dc.conf'
--- etc/init/samba-ad-dc.conf 1970-01-01 00:00:00 +0000
+++ etc/init/samba-ad-dc.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,16 @@
+description "SMB/CIFS File and Active Directory Server"
+author "Jelmer Vernooij <[email protected]>"
+
+start on (local-filesystems and net-device-up)
+stop on runlevel [!2345]
+
+expect fork
+normal exit 0
+
+pre-start script
+ [ -r /etc/default/samba4 ] && . /etc/default/samba4
+ install -o root -g root -m 755 -d /var/run/samba
+ install -o root -g root -m 755 -d /var/log/samba
+end script
+
+exec samba -D
=== removed file 'etc/init/samba4.conf'
--- etc/init/samba4.conf 2013-11-18 12:42:03 +0000
+++ etc/init/samba4.conf 1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-description "SMB/CIFS File and Active Directory Server"
-author "Jelmer Vernooij <[email protected]>"
-
-start on (local-filesystems and net-device-up)
-stop on runlevel [!2345]
-
-expect fork
-normal exit 0
-
-pre-start script
- [ -r /etc/default/samba4 ] && . /etc/default/samba4
- install -o root -g root -m 755 -d /var/run/samba
- install -o root -g root -m 755 -d /var/log/samba
-end script
-
-exec samba -D
=== added file 'etc/init/ulogd2.conf'
--- etc/init/ulogd2.conf 1970-01-01 00:00:00 +0000
+++ etc/init/ulogd2.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,13 @@
+# ulogd2 - Netfilter Userspace Logging Daemon
+#
+# ulogd is an advanced netfilter logging daemon.
+
+description "Netfilter Userspace Logging Daemon"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+expect fork
+respawn
+
+exec /usr/sbin/ulogd --daemon --uid ulog
=== modified file 'usr/share/upstart/sessions/application-click.conf'
--- usr/share/upstart/sessions/application-click.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/application-click.conf 2013-12-06 17:20:05 +0000
@@ -26,8 +26,5 @@
# Remember, this is confined
exec /usr/lib/i386-linux-gnu/upstart-app-launch/exec-line-exec
-# Disabled for Phone 1.0 which doesn't yet have ZG installed on it,
-# so we don't need to log the data.
-#
-# post-start exec /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app open
-# post-stop exec /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app close
+post-start exec /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app open
+post-stop exec /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app close
=== modified file 'usr/share/upstart/sessions/application-legacy.conf'
--- usr/share/upstart/sessions/application-legacy.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/application-legacy.conf 2013-12-06 17:20:05 +0000
@@ -26,8 +26,5 @@
exec /usr/lib/i386-linux-gnu/upstart-app-launch/exec-line-exec
-# Disabled for Phone 1.0 which doesn't yet have ZG installed on it,
-# so we don't need to log the data.
-#
-# post-start exec /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app open
-# post-stop exec /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app close
+post-start exec /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app open
+post-stop exec /usr/lib/i386-linux-gnu/upstart-app-launch/zg-report-app close
=== modified file 'usr/share/upstart/sessions/dbus.conf'
--- usr/share/upstart/sessions/dbus.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/dbus.conf 2013-12-06 17:20:05 +0000
@@ -13,4 +13,6 @@
echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}" >$HOME/.cache/upstart/dbus-session
end script
-exec dbus-daemon --fork --session --address=$DBUS_SESSION_BUS_ADDRESS
+exec dbus-daemon --fork --session --address="$DBUS_SESSION_BUS_ADDRESS"
+
+post-start exec initctl notify-dbus-address "$DBUS_SESSION_BUS_ADDRESS" || true
=== modified file 'usr/share/upstart/sessions/gnome-session.conf'
--- usr/share/upstart/sessions/gnome-session.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/gnome-session.conf 2013-12-06 17:20:05 +0000
@@ -9,7 +9,10 @@
emits desktop-start
emits desktop-end
+script
+unset UPSTART_EVENTS UPSTART_INSTANCE UPSTART_JOB
exec gnome-session --session=$DESKTOP_SESSION
+end script
post-start exec initctl emit desktop-start DESKTOP_SESSION=$DESKTOP_SESSION
=== added file 'usr/share/upstart/sessions/indicator-application.conf'
--- usr/share/upstart/sessions/indicator-application.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/indicator-application.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,15 @@
+description "Indicator Application Service"
+
+# NOTE: Limiting only to Unity 7 right now as it's still using
+# dbusmenu. That can be lifted after it is ported to GMenu
+
+start on (indicators-loaded or indicator-services-start) and xsession SESSION=ubuntu
+stop on desktop-end or indicator-services-end
+
+emits appindicators-start appindicators-end
+
+respawn
+
+exec /usr/lib/i386-linux-gnu/indicator-application-service
+
+pre-stop exec initctl emit appindicators-end
=== added file 'usr/share/upstart/sessions/indicator-datetime.conf'
--- usr/share/upstart/sessions/indicator-datetime.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/indicator-datetime.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,8 @@
+description "Indicator Date & Time Backend"
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec /usr/lib/i386-linux-gnu/indicator-datetime/indicator-datetime-service
=== added file 'usr/share/upstart/sessions/indicator-location.conf'
--- usr/share/upstart/sessions/indicator-location.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/indicator-location.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,8 @@
+description "Indicator Location Backend"
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec /usr/lib/i386-linux-gnu/indicator-location/indicator-location-service
=== added file 'usr/share/upstart/sessions/indicator-power.conf'
--- usr/share/upstart/sessions/indicator-power.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/indicator-power.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,11 @@
+description "Indicator Power Backend"
+
+# Want to move to indicator-services-[start|end], but that's not all
+# there yet. Use the signals that exist today for now.
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec /usr/lib/i386-linux-gnu/indicator-power/indicator-power-service
=== added file 'usr/share/upstart/sessions/indicator-session.conf'
--- usr/share/upstart/sessions/indicator-session.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/indicator-session.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,8 @@
+description "Indicator Session Service"
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec /usr/lib/i386-linux-gnu/indicator-session/indicator-session-service
=== added file 'usr/share/upstart/sessions/indicator-sound.conf'
--- usr/share/upstart/sessions/indicator-sound.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/indicator-sound.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,11 @@
+description "Indicator Sound Backend"
+
+# Want to move to indicator-services-[start|end], but that's not all
+# there yet. Use the signals that exist today for now.
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec /usr/lib/i386-linux-gnu/indicator-sound/indicator-sound-service
=== added file 'usr/share/upstart/sessions/indicator-sync.conf'
--- usr/share/upstart/sessions/indicator-sync.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/indicator-sync.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,8 @@
+description "Indicator Sync Backend"
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec /usr/lib/i386-linux-gnu/indicator-sync/indicator-sync-service
=== modified file 'usr/share/upstart/sessions/mtp-server.conf'
--- usr/share/upstart/sessions/mtp-server.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/mtp-server.conf 2013-12-06 17:20:05 +0000
@@ -1,17 +1,8 @@
description "MTP protocol server"
-start on :sys:android_usb-device-changed
+start on :sys:android-usb-connected
+stop on :sys:android-usb-disconnected
respawn
-pre-start script
- state=`cat /sys/class/android_usb/android0/state`
- if [ "$state" = "DISCONNECTED" ]; then
- stop
- exit 0
- fi
-
- rm -f ~/.cache/upstart/mtp-server.log
-end script
-
exec /usr/bin/mtp-server
=== added file 'usr/share/upstart/sessions/scope-registry.conf'
--- usr/share/upstart/sessions/scope-registry.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/scope-registry.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,10 @@
+description "Scope registry"
+author "Michal Hruby <[email protected]>"
+
+start on started dbus
+stop on desktop-end
+
+respawn
+respawn limit 10 60
+
+exec /usr/lib/i386-linux-gnu/scoperegistry/scoperegistry
=== added file 'usr/share/upstart/sessions/unity-voice-service.conf'
--- usr/share/upstart/sessions/unity-voice-service.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/unity-voice-service.conf 2013-12-06 17:20:05 +0000
@@ -0,0 +1,5 @@
+description "Service to perform voice recognition"
+
+respawn
+
+exec /usr/lib/i386-linux-gnu/unity-voice-service
=== modified file 'usr/share/upstart/sessions/unity8.conf'
--- usr/share/upstart/sessions/unity8.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/unity8.conf 2013-12-06 17:20:05 +0000
@@ -5,5 +5,26 @@
stop on desktop-end
respawn
+expect stop
+
+pre-start script
+ if [ -n "$MIR_SOCKET" ]; then
+ if [ -z "$UNITY_MIR_SOCKET" ]; then
+ # Save original value of MIR_SOCKET in case we are restarted,
+ # as we modify the variable for future jobs, including ourself.
+ UNITY_MIR_SOCKET=$MIR_SOCKET
+ initctl set-env --global UNITY_MIR_SOCKET=$UNITY_MIR_SOCKET
+ fi
+
+ # Point unity8 at unity-system-compositor
+ MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket
+ initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE
+ initctl set-env MIR_SERVER_HOST_SOCKET=$UNITY_MIR_SOCKET
+
+ # Point all future jobs in this session to our Mir socket instead of
+ # unity-system-compositor's socket.
+ initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
+ fi
+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
