------------------------------------------------------------
revno: 43
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Wed 2014-03-12 12:07:43 +0000
message:
auto update
removed:
etc/init/hv-kvp-daemon.conf
etc/init/hv-vss-daemon.conf
etc/init/hybrid-gfx.conf
added:
etc/init/bluetooth-touch-flo.conf
etc/init/cups.override
etc/init/gpu-manager.conf
etc/init/mtp-state.conf
etc/init/neutron-plugin-bigswitch-agent.conf
etc/init/neutron-plugin-ibm-agent.conf
etc/init/neutron-plugin-openflow-agent.conf
etc/init/ssh-property-watcher.conf
etc/init/swift-container-sync.conf
etc/init/swift-object-expirer.conf
usr/share/upstart/sessions/unity-panel-service-lockscreen.conf
usr/share/upstart/sessions/unity8-mir.conf
modified:
etc/init/android-tools-adbd.conf
etc/init/android-usb-state.conf
etc/init/boot-hooks/set-display-mir.conf
etc/init/click-system-hooks.conf
etc/init/cups-browsed.conf
etc/init/cups.conf
etc/init/lxc-net.conf
etc/init/maas-region-celery.conf
etc/init/maas-txlongpoll.conf
etc/init/mongodb.conf
etc/init/neutron-plugin-mlnx-agent.conf
etc/init/nvidia-prime.conf
etc/init/pollen.conf
etc/init/pollinate.conf
etc/init/wait-for-state.conf
usr/share/upstart/sessions/click-user-hooks.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
=== modified file 'etc/init/android-tools-adbd.conf'
--- etc/init/android-tools-adbd.conf 2013-11-18 12:42:03 +0000
+++ etc/init/android-tools-adbd.conf 2014-03-12 12:07:43 +0000
@@ -4,30 +4,22 @@
description "adbd"
-start on filesystem or runlevel [2345]
-stop on runlevel [!2345]
+start on android-container persist.sys.usb.config=*adb
+stop on runlevel [06]
respawn
pre-start script
if [ -d /sys/class/android_usb ]
then
- # retrieve the product info from Android
- manufacturer=$(getprop ro.product.manufacturer Android)
- model=$(getprop ro.product.model Android)
- serial=$(getprop ro.serialno 0123456789ABCDEF)
-
- echo 0 >/sys/class/android_usb/android0/enable
- echo 18d1 >/sys/class/android_usb/android0/idVendor
- echo D002 >/sys/class/android_usb/android0/idProduct
- echo adb >/sys/class/android_usb/android0/functions
-
- echo -n $manufacturer >/sys/class/android_usb/android0/iManufacturer
- echo -n $model >/sys/class/android_usb/android0/iProduct
- echo -n $serial >/sys/class/android_usb/android0/iSerial
-
- echo 1 >/sys/class/android_usb/android0/enable
-
+
+ if [ -d /sys/class/android_usb/android0/f_ffs ]
+ then
+ # some devices use the functionfs (i.e. manta)
+ # we need to mount it to keep adb working
+ mkdir -p /dev/usb-ffs/adb
+ mount -t functionfs adb /dev/usb-ffs/adb
+ fi
else
grep -q qemu /proc/cmdline || { stop; exit 0; }
fi
=== modified file 'etc/init/android-usb-state.conf'
--- etc/init/android-usb-state.conf 2013-11-18 12:42:03 +0000
+++ etc/init/android-usb-state.conf 2014-03-12 12:07:43 +0000
@@ -6,7 +6,7 @@
emits android-usb-disconnected
script
- if [ "$USB_STATE" = CONFIGURED ]; then
+ if [ "$USB_STATE" = CONNECTED ]; then
/sbin/initctl emit android-usb-connected
elif [ "$USB_STATE" = DISCONNECTED ]; then
/sbin/initctl emit android-usb-disconnected
=== added file 'etc/init/bluetooth-touch-flo.conf'
--- etc/init/bluetooth-touch-flo.conf 1970-01-01 00:00:00 +0000
+++ etc/init/bluetooth-touch-flo.conf 2014-03-12 12:07:43 +0000
@@ -0,0 +1,31 @@
+# bluetooth-touch-flo - Bluetooth initialization
+#
+# Bluetooth initialization job, specifically for the Nexus 7 2013 device (flo),
+# starts the hciattach job in the android container to run hci_qcomm_init,
+# which will write the bluetooth address and bring up the chip.
+#
+
+description "Nexus 7 (flo) bluetooth initialization"
+
+task
+
+pre-start script
+ 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
+end script
+
+script
+ setprop ctl.start hciattach
+ sleep 5
+ setprop bluetooth.hciattach true
+ echo 1 > /sys/module/hci_smd/parameters/hcismd_set
+end script
=== modified file 'etc/init/boot-hooks/set-display-mir.conf'
--- etc/init/boot-hooks/set-display-mir.conf 2014-02-23 12:07:38 +0000
+++ etc/init/boot-hooks/set-display-mir.conf 2014-03-12 12:07:43 +0000
@@ -28,7 +28,7 @@
if [ ! -e "$FLAG" ]; then
# only enable on supported devices
case "$(getprop ro.product.device)" in
- grouper|maguro|mako|manta|generic|flo)
+ grouper|maguro|mako|manta|generic|flo|deb|hammerhead)
touch "$DISPLAY_MIR"
;;
esac
=== modified file 'etc/init/click-system-hooks.conf'
--- etc/init/click-system-hooks.conf 2013-11-18 12:42:03 +0000
+++ etc/init/click-system-hooks.conf 2014-03-12 12:07:43 +0000
@@ -5,4 +5,4 @@
task
-exec click hook run-system
+exec /usr/bin/click hook run-system
=== modified file 'etc/init/cups-browsed.conf'
--- etc/init/cups-browsed.conf 2013-11-18 12:42:03 +0000
+++ etc/init/cups-browsed.conf 2014-03-12 12:07:43 +0000
@@ -4,7 +4,6 @@
author "Till Kamppeter <[email protected]>"
start on (filesystem
- and started avahi-daemon
and (started cups or runlevel [2345]))
stop on runlevel [016]
=== modified file 'etc/init/cups.conf'
--- etc/init/cups.conf 2013-11-18 12:42:03 +0000
+++ etc/init/cups.conf 2014-03-12 12:07:43 +0000
@@ -4,7 +4,6 @@
author "Michael Sweet <[email protected]>"
start on (filesystem
- and started avahi-daemon
and (started dbus or runlevel [2345]))
stop on runlevel [016]
@@ -31,7 +30,7 @@
fi
end script
-exec /usr/sbin/cupsd -F
+exec /usr/sbin/cupsd -f
post-start script
# wait until daemon is ready
=== added file 'etc/init/cups.override'
--- etc/init/cups.override 1970-01-01 00:00:00 +0000
+++ etc/init/cups.override 2014-03-12 12:07:43 +0000
@@ -0,0 +1,4 @@
+# cups - CUPS Printing spooler and server
+# socket activation overrides for touch
+start on socket PROTO=inet PORT=631 ADDR=127.0.0.1
+exec /usr/sbin/cupsd -f -x 30
=== added file 'etc/init/gpu-manager.conf'
--- etc/init/gpu-manager.conf 1970-01-01 00:00:00 +0000
+++ etc/init/gpu-manager.conf 2014-03-12 12:07:43 +0000
@@ -0,0 +1,6 @@
+start on (starting lightdm
+ or starting kdm
+ or starting xdm
+ or starting lxdm)
+task
+exec gpu-manager --log /var/log/gpu-manager.log
=== removed file 'etc/init/hv-kvp-daemon.conf'
--- etc/init/hv-kvp-daemon.conf 2013-11-18 12:42:03 +0000
+++ etc/init/hv-kvp-daemon.conf 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-# On Azure/Hyper-V systems start the hv_kvp_daemon
-#
-description "Hyper-V KVP Protocol Daemon"
-author "Adam Conrad <[email protected]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-console log
-
-pre-start script
- if [ -e "/etc/default/hv-kvp-daemon-init" ]; then
- . /etc/default/hv-kvp-daemon-init
- fi
- [ "$RUN_DAEMON" -eq 0 ] && { stop; exit 0; }
- [ -x /usr/sbin/hv_kvp_daemon ] || { stop; exit 0; }
-end script
-
-exec /usr/sbin/hv_kvp_daemon
=== removed file 'etc/init/hv-vss-daemon.conf'
--- etc/init/hv-vss-daemon.conf 2013-11-18 12:42:03 +0000
+++ etc/init/hv-vss-daemon.conf 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-# On Azure/Hyper-V systems start the hv_vss_daemon
-#
-description "Hyper-V VSS Protocol Daemon"
-author "Ben Howard <[email protected]>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-console log
-
-pre-start script
- if [ -e "/etc/default/hv-vss-daemon-init" ]; then
- . /etc/default/hv-vss-daemon-init
- fi
- [ "$RUN_DAEMON" -eq 0 ] && { stop; exit 0; }
- [ -x /usr/sbin/hv_vss_daemon ] || { stop; exit 0; }
-end script
-
-exec /usr/sbin/hv_vss_daemon
=== removed file 'etc/init/hybrid-gfx.conf'
--- etc/init/hybrid-gfx.conf 2013-11-18 12:42:03 +0000
+++ etc/init/hybrid-gfx.conf 1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-start on (starting lightdm
- or starting kdm
- or starting xdm
- or starting lxdm)
-task
-exec hybrid-detect
=== modified file 'etc/init/lxc-net.conf'
--- etc/init/lxc-net.conf 2014-02-20 12:08:32 +0000
+++ etc/init/lxc-net.conf 2014-03-12 12:07:43 +0000
@@ -60,7 +60,7 @@
LXC_DOMAIN_ARG=""
if [ -n "$LXC_DOMAIN" ]; then
- LXC_DOMAIN_ARG="-s $LXC_DOMAIN"
+ LXC_DOMAIN_ARG="-s $LXC_DOMAIN -S /$LXC_DOMAIN/"
fi
dnsmasq $LXC_DOMAIN_ARG -u lxc-dnsmasq --strict-order --bind-interfaces --pid-file=${varrun}/dnsmasq.pid --conf-file=${LXC_DHCP_CONFILE} --listen-address ${LXC_ADDR} --dhcp-range ${LXC_DHCP_RANGE} --dhcp-lease-max=${LXC_DHCP_MAX} --dhcp-no-override --except-interface=lo --interface=${LXC_BRIDGE} --dhcp-leasefile=/var/lib/misc/dnsmasq.${LXC_BRIDGE}.leases --dhcp-authoritative || cleanup
touch ${varrun}/network_up
=== modified file 'etc/init/maas-region-celery.conf'
--- etc/init/maas-region-celery.conf 2013-12-24 12:07:48 +0000
+++ etc/init/maas-region-celery.conf 2014-03-12 12:07:43 +0000
@@ -16,7 +16,7 @@
env DJANGO_SETTINGS_MODULE="maas.settings"
pre-start script
- if ! /usr/sbin/rabbitmqctl list_user_permissions $workers_user 1>/dev/null 2>&1; then
+ if -f /usr/sbin/rabbitmqctl && ! /usr/sbin/rabbitmqctl list_user_permissions $workers_user 1>/dev/null 2>&1; then
workers_pass=`grep "maas_workers" /etc/maas/maas_local_celeryconfig.py | cut -d':' -f3 | cut -d'@' -f1`
/usr/sbin/rabbitmqctl add_user "$workers_user" "$workers_pass"
/usr/sbin/rabbitmqctl add_vhost "$workers_vhost"
=== modified file 'etc/init/maas-txlongpoll.conf'
--- etc/init/maas-txlongpoll.conf 2013-12-24 12:07:48 +0000
+++ etc/init/maas-txlongpoll.conf 2014-03-12 12:07:43 +0000
@@ -15,7 +15,7 @@
env longpoll_vhost="/maas_longpoll"
pre-start script
- if ! /usr/sbin/rabbitmqctl list_user_permissions $longpoll_user 1>/dev/null 2>&1; then
+ if -f /usr/sbin/rabbitmqctl && ! /usr/sbin/rabbitmqctl list_user_permissions $longpoll_user 1>/dev/null 2>&1; then
longpoll_pass=`/bin/grep "password" /etc/maas/txlongpoll.yaml | cut -d'"' -f2`
/usr/sbin/rabbitmqctl add_user "$longpoll_user" "$longpoll_pass"
/usr/sbin/rabbitmqctl add_vhost "$longpoll_vhost"
=== modified file 'etc/init/mongodb.conf'
--- etc/init/mongodb.conf 2013-11-18 12:42:03 +0000
+++ etc/init/mongodb.conf 2014-03-12 12:07:43 +0000
@@ -4,7 +4,7 @@
start on runlevel [2345]
stop on runlevel [!2345]
-limit nofile 20000 20000
+limit nofile 64000 64000
kill timeout 300 # wait 300s between SIGTERM and SIGKILL.
=== added file 'etc/init/mtp-state.conf'
--- etc/init/mtp-state.conf 1970-01-01 00:00:00 +0000
+++ etc/init/mtp-state.conf 2014-03-12 12:07:43 +0000
@@ -0,0 +1,18 @@
+start on android-container persist.sys.usb.config=* and started lightdm
+
+task
+
+emits android-mtp-on
+emits android-mtp-off
+
+script
+ VAL=$(env | grep persist.sys.usb.config=)
+ case ${VAL##*=} in
+ mtp*)
+ /sbin/initctl emit android-mtp-on
+ ;;
+ *)
+ /sbin/initctl emit android-mtp-off
+ ;;
+ esac
+end script
=== added file 'etc/init/neutron-plugin-bigswitch-agent.conf'
--- etc/init/neutron-plugin-bigswitch-agent.conf 1970-01-01 00:00:00 +0000
+++ etc/init/neutron-plugin-bigswitch-agent.conf 2014-03-12 12:07:43 +0000
@@ -0,0 +1,20 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron BigSwitch Plugin Agent"
+author "Chuck Short <[email protected]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+ mkdir -p /var/run/neutron
+ chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-restproxy-agent -- \
+ --config-file=/etc/neutron/neutron.conf \
+ --config-file=/etc/neutron/plugins/bigswitch/restproxy.ini \
+ --log-file=/var/log/neutron/bigswitch-agent.log
=== added file 'etc/init/neutron-plugin-ibm-agent.conf'
--- etc/init/neutron-plugin-ibm-agent.conf 1970-01-01 00:00:00 +0000
+++ etc/init/neutron-plugin-ibm-agent.conf 2014-03-12 12:07:43 +0000
@@ -0,0 +1,20 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron IBM SDN Agent"
+author "Chuck Short <[email protected]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+ mkdir -p /var/run/neutron
+ chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ibm-agent -- \
+ --config-file=/etc/neutron/neutron.conf \
+ --config-file=/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini \
+ --log-file=/var/log/neutron/ibm-agent.log
=== modified file 'etc/init/neutron-plugin-mlnx-agent.conf'
--- etc/init/neutron-plugin-mlnx-agent.conf 2014-01-28 12:07:48 +0000
+++ etc/init/neutron-plugin-mlnx-agent.conf 2014-03-12 12:07:43 +0000
@@ -16,4 +16,4 @@
exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-mlnx-agent -- \
--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/mlnx/mlnx_conf.ini \
- --log-file=/var/log/neutron/mlnx_conf.log
+ --log-file=/var/log/neutron/mlnx-agent.log
=== added file 'etc/init/neutron-plugin-openflow-agent.conf'
--- etc/init/neutron-plugin-openflow-agent.conf 1970-01-01 00:00:00 +0000
+++ etc/init/neutron-plugin-openflow-agent.conf 2014-03-12 12:07:43 +0000
@@ -0,0 +1,20 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron OpenFlow Plugin Agent"
+author "Chuck Short <[email protected]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+ mkdir -p /var/run/neutron
+ chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ofagent-agent -- \
+ --config-file=/etc/neutron/neutron.conf \
+ --config-file=/etc/neutron/plugins/ml2/ml2_conf_ofa.ini \
+ --log-file=/var/log/neutron/openflow-agent.log
=== modified file 'etc/init/nvidia-prime.conf'
--- etc/init/nvidia-prime.conf 2013-12-19 12:08:32 +0000
+++ etc/init/nvidia-prime.conf 2014-03-12 12:07:43 +0000
@@ -5,10 +5,6 @@
#
# NVIDIA PRIME - Power Saving Mode
#
-# We need to make sure that bbswitch is loaded and
-# that the NVIDIA card is disabled before lightdm
-# starts X if system settings require so.
-#
# On system shutdown we remove bbswitch and re-enable
# the NVIDIA card.
#
@@ -24,9 +20,6 @@
script
LOG=/var/log/nvidia-prime-upstart.log
- prime_settings=/etc/prime-discrete
- prime_power=/proc/acpi/bbswitch
- force_prime=/etc/force-prime
prime_supported=/usr/bin/prime-supported
# Remove any previous logs
@@ -43,75 +36,6 @@
/usr/bin/start-nvidia-persistenced
exit 0
fi
-
- if lsmod | grep nouveau > /dev/null; then
- # exit if nouveau is in use
- echo "Sorry but nvidia-prime does not work with the nouveau driver" \
- >> $LOG 2>&1
- exit 0
- fi
-
- if [ ! -e $prime_settings ]; then
- echo "No settings for nvidia-prime can be found in $prime_settings" \
- >> $LOG 2>&1
- exit 0
- fi
-
- if [ ! -e $prime_power ]; then
- echo "No bbswitch can be found 1st attempt" \
- >> $LOG 2>&1
- opts="`/sbin/get-quirk-options`"
- # Load bbswitch
- /sbin/modprobe bbswitch load_state=-1 unload_state=1 "$opts" || true
- # Try again
- if [ ! -e $prime_power ]; then
- echo "No bbswitch can be found 2nd attempt" \
- >> $LOG 2>&1
- exit 0
- fi
- fi
-
- nvidia_status="`cat $prime_power | cut -d " " -f2`"
- action="`cat $prime_settings`"
-
- # We support both uppercase and lowercase
- action="$(echo "$action" | /usr/bin/tr '[:upper:]' '[:lower:]')"
-
- if [ "$action" = "on" ]; then
- echo "Configuring xorg.conf" \
- >> $LOG 2>&1
- /sbin/prime-xconfig on
- echo "Configuring alternatives" \
- >> $LOG 2>&1
- # Make sure the alternatives are in sync
- /usr/bin/prime-select nvidia \
- >> $LOG 2>&1
- elif [ "$action" = "off" ]; then
- echo "Moving xorg.conf away" \
- >> $LOG 2>&1
- /sbin/prime-xconfig off
- echo "Configuring alternatives" \
- >> $LOG 2>&1
- # Make sure the alternatives are in sync
- /usr/bin/prime-select intel \
- >> $LOG 2>&1
-
- # Do we need to take action?
- if [ "$action" = "$nvidia_status" ]; then
- echo "No action required to get nvidia-prime to work" \
- >> $LOG 2>&1
- exit 0
- fi
-
- # Disable the card
- echo "Disabling the NVIDIA card" \
- >> $LOG 2>&1
- # Tell nvidia-persistenced the nvidia card is about
- # to be switched off
- /sbin/initctl emit nvidia-off
- /sbin/rmmod nvidia || true
- echo "OFF" > /proc/acpi/bbswitch
- fi
end script
pre-stop script
=== modified file 'etc/init/pollen.conf'
--- etc/init/pollen.conf 2014-01-16 12:08:34 +0000
+++ etc/init/pollen.conf 2014-03-12 12:07:43 +0000
@@ -14,14 +14,6 @@
. /etc/default/pollen
# Ensure our device exists, and is a character device, before starting our server
if [ -c "$DEVICE" ]; then
- if [ -n "$HTTP_PORT" ] && [ -n "$HTTPS_PORT" ]; then
- exec pollen $HTTP_PORT $HTTPS_PORT $DEVICE
- elif [ -n "$HTTP_PORT" ] && [ -z "$HTTPS_PORT" ]; then
- exec pollen $HTTP_PORT 0 $DEVICE
- elif [ -z "$HTTP_PORT" ] && [ -n "$HTTPS_PORT" ]; then
- exec pollen 0 $HTTPS_PORT $DEVICE
- else
- exec true
- fi
+ exec pollen -http-port=$HTTP_PORT -https-port=$HTTPS_PORT -device=$DEVICE -bytes=$BYTES -cert=$CERT -key=$KEY
fi
end script
=== modified file 'etc/init/pollinate.conf'
--- etc/init/pollinate.conf 2014-02-11 12:08:05 +0000
+++ etc/init/pollinate.conf 2014-03-12 12:07:43 +0000
@@ -5,9 +5,6 @@
setuid pollinate
-start on (started networking or starting ssh or starting cloud-init)
+start on (started networking or starting ssh)
-script
- . /etc/default/pollinate
- exec pollinate
-end script
+exec pollinate
=== added file 'etc/init/ssh-property-watcher.conf'
--- etc/init/ssh-property-watcher.conf 1970-01-01 00:00:00 +0000
+++ etc/init/ssh-property-watcher.conf 2014-03-12 12:07:43 +0000
@@ -0,0 +1,15 @@
+start on android-container persist.service.ssh=*
+
+task
+
+script
+ VAL=$(env | grep persist.service.ssh=)
+ case ${VAL##*=} in
+ true)
+ start ssh
+ ;;
+ false)
+ stop ssh
+ ;;
+ esac
+end script
=== added file 'etc/init/swift-container-sync.conf'
--- etc/init/swift-container-sync.conf 1970-01-01 00:00:00 +0000
+++ etc/init/swift-container-sync.conf 2014-03-12 12:07:43 +0000
@@ -0,0 +1,15 @@
+description "SWIFT Container Sync"
+author "James Page <[email protected]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+pre-start script
+ if [ -f "/etc/swift/container-server.conf" ]; then
+ exec /usr/bin/swift-init container-sync start
+ else
+ exit 1
+ fi
+end script
+
+post-stop exec /usr/bin/swift-init container-sync stop
=== added file 'etc/init/swift-object-expirer.conf'
--- etc/init/swift-object-expirer.conf 1970-01-01 00:00:00 +0000
+++ etc/init/swift-object-expirer.conf 2014-03-12 12:07:43 +0000
@@ -0,0 +1,15 @@
+description "SWIFT Object Expirer"
+author "Will Kelly <[email protected]>"
+
+start on runlevel [2345]
+stop on runlevel [016]
+
+pre-start script
+ if [ -f "/etc/swift/object-expirer.conf" ]; then
+ exec /usr/bin/swift-init object-expirer start
+ else
+ exit 1
+ fi
+end script
+
+post-stop exec /usr/bin/swift-init object-expirer stop
=== modified file 'etc/init/wait-for-state.conf'
--- etc/init/wait-for-state.conf 2013-11-18 12:42:03 +0000
+++ etc/init/wait-for-state.conf 2014-03-12 12:07:43 +0000
@@ -26,7 +26,7 @@
# XXX: initctl show-config should share manual w/ us too
case $MANUAL_OVERRIDE in
N|n|0)
- if grep -q "^\s*manual\s*$" /etc/init/$WAIT_FOR.conf ; then
+ if grep -q "^\s*manual\s*$" /etc/init/$WAIT_FOR.conf /etc/init/$WAIT_FOR.override ; then
exit 0
fi
;;
=== modified file 'usr/share/upstart/sessions/click-user-hooks.conf'
--- usr/share/upstart/sessions/click-user-hooks.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/click-user-hooks.conf 2014-03-12 12:07:43 +0000
@@ -5,4 +5,4 @@
task
-exec click hook run-user
+exec /usr/bin/click hook run-user
=== modified file 'usr/share/upstart/sessions/mtp-server.conf'
--- usr/share/upstart/sessions/mtp-server.conf 2013-12-06 17:20:05 +0000
+++ usr/share/upstart/sessions/mtp-server.conf 2014-03-12 12:07:43 +0000
@@ -1,7 +1,7 @@
description "MTP protocol server"
-start on :sys:android-usb-connected
-stop on :sys:android-usb-disconnected
+start on :sys:android-mtp-on or :sys:android-usb-connected
+stop on desktop-end or :sys:android-mtp-off
respawn
=== added file 'usr/share/upstart/sessions/unity-panel-service-lockscreen.conf'
--- usr/share/upstart/sessions/unity-panel-service-lockscreen.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/unity-panel-service-lockscreen.conf 2014-03-12 12:07:43 +0000
@@ -0,0 +1,8 @@
+description "Backing Service for the Unity Panel"
+author "Andrea Azzarone <[email protected]>"
+
+start on desktop-lock
+stop on desktop-unlock
+
+respawn
+exec /usr/lib/unity/unity-panel-service --lockscreen-mode
=== added file 'usr/share/upstart/sessions/unity8-mir.conf'
--- usr/share/upstart/sessions/unity8-mir.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/unity8-mir.conf 2014-03-12 12:07:43 +0000
@@ -0,0 +1,37 @@
+description "Unity Shell v8 on Mir"
+
+start on xsession SESSION=unity8-mir and started dbus
+stop on desktop-end
+
+respawn
+expect stop
+
+env QT_QPA_PLATFORM=ubuntumirserver
+env UPSTART_JOB=unity8
+
+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
+ initctl set-env --global QT_QPA_PLATFORM=ubuntumirclient
+ initctl set-env --global EGL_PLATFORM=mir
+ initctl set-env --global UBUNTU_PLATFORM_API_BACKEND=libubuntu_application_api_test.so.1
+ initctl set-env --global UBUNTU_PLATFORM_API_SENSOR_TEST=/usr/share/unity8-desktop-session/sensors.txt
+ initctl set-env --global QML2_IMPORT_PATH=/usr/lib/i386-linux-gnu/qt5/imports/Unity-Mir
+ fi
+end script
+
+exec ${BINARY:-unity8} $ARGS
=== modified file 'usr/share/upstart/sessions/unity8.conf'
--- usr/share/upstart/sessions/unity8.conf 2014-02-05 12:07:41 +0000
+++ usr/share/upstart/sessions/unity8.conf 2014-03-12 12:07:43 +0000
@@ -28,6 +28,11 @@
initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
fi
+
+ # Remove the socket if still there
+ if [ -S "$MIR_SERVER_FILE" ]; then
+ rm "$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
