------------------------------------------------------------
revno: 53
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Fri 2014-04-04 12:08:30 +0100
message:
auto update
removed:
usr/share/upstart/sessions/indicator-sync.conf
added:
etc/init/adbd-emergency-shell.conf
etc/init/neutron-metering-agent.conf
etc/init/neutron-vpn-agent.conf
etc/init/plymouth-upstart-bridge.override
etc/init/ssh-keygen.conf
etc/init/ureadahead-other.override
etc/init/ureadahead.override
usr/share/upstart/sessions/media-hub.override
modified:
etc/init/lxc-android-boot.conf
etc/init/lxc-android-config.conf
etc/init/maas-region-celery.conf
etc/init/maas-txlongpoll.conf
etc/init/plymouth-upstart-bridge.conf
etc/init/ureadahead-touch.conf
usr/share/upstart/sessions/unity8-mir.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/adbd-emergency-shell.conf'
--- etc/init/adbd-emergency-shell.conf 1970-01-01 00:00:00 +0000
+++ etc/init/adbd-emergency-shell.conf 2014-04-04 11:08:30 +0000
@@ -0,0 +1,23 @@
+# adbd - run adb emergency shell
+#
+# This task enables the adb shell in emergency mode if the
+# android container fails to start
+
+description "adbd emergency shell"
+
+start on stopped lxc-android-config RESULT=failed
+stop on runlevel [!2345]
+
+respawn
+
+pre-start script
+ echo 0 >/sys/class/android_usb/android0/enable
+
+ echo -n 18d1 >/sys/class/android_usb/android0/idVendor
+ echo -n D002 >/sys/class/android_usb/android0/idProduct
+ echo -n adb >/sys/class/android_usb/android0/functions
+
+ echo 1 >/sys/class/android_usb/android0/enable
+end script
+
+exec /usr/bin/adbd
=== modified file 'etc/init/lxc-android-boot.conf'
--- etc/init/lxc-android-boot.conf 2014-02-15 12:08:48 +0000
+++ etc/init/lxc-android-boot.conf 2014-04-04 11:08:30 +0000
@@ -10,11 +10,6 @@
script
# Read-only flipped model doesn't need all this
- [ ! -e /etc/ssh/ssh_host_rsa_key ] && \
- ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa >/dev/null 2>&1
- [ ! -e /etc/ssh/ssh_host_dsa_key ] && \
- ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa >/dev/null 2>&1
-
[ -d /android ] && exit 0
/usr/lib/lxc-android-config/update-fstab
@@ -28,3 +23,4 @@
cp /usr/lib/lxc-android-config/70-$device.rules /lib/udev/rules.d/
# add device specific hacks and workarounds below
end script
+
=== modified file 'etc/init/lxc-android-config.conf'
--- etc/init/lxc-android-config.conf 2014-02-22 12:07:48 +0000
+++ etc/init/lxc-android-config.conf 2014-04-04 11:08:30 +0000
@@ -4,7 +4,7 @@
description "lxc android config and container initialization"
-start on started cgroup-lite
+start on started cgmanager
stop on runlevel [06]
emits android
@@ -19,22 +19,26 @@
mount --bind /sys/fs/cgroup/cpu /dev/cpuctl
fi
- lxc-wait -n android -s RUNNING
+ lxc-wait -n android -s RUNNING -t 30
containerpid="$(lxc-info -n android -p -H)"
- while true; do
- [ -f /proc/$containerpid/root/dev/.coldboot_done ] && break
- sleep 0.1
- done
-
- # Allow custom properties before announcing that the boot is completed
- if [ -f /custom/custom.prop ]; then
- while [ ! -e /dev/socket/property_service ]; do sleep 0.1; done
- grep "^custom\." /custom/custom.prop | sed 's/=/ /' | while read property value; do
- setprop $property $value
+ if [ -n "$containerpid" ]; then
+ while true; do
+ [ -f /proc/$containerpid/root/dev/.coldboot_done ] && break
+ sleep 0.1
done
+
+ # Allow custom properties before announcing that the boot is completed
+ if [ -f /custom/custom.prop ]; then
+ while [ ! -e /dev/socket/property_service ]; do sleep 0.1; done
+ grep "^custom\." /custom/custom.prop | sed 's/=/ /' | while read property value; do
+ setprop $property $value
+ done
+ fi
+
+ initctl emit android
+ else
+ stop; exit 1
fi
-
- initctl emit android
end script
pre-stop exec lxc-stop -n android -k
=== modified file 'etc/init/maas-region-celery.conf'
--- etc/init/maas-region-celery.conf 2014-03-12 12:07:43 +0000
+++ etc/init/maas-region-celery.conf 2014-04-04 11:08:30 +0000
@@ -16,7 +16,7 @@
env DJANGO_SETTINGS_MODULE="maas.settings"
pre-start script
- if -f /usr/sbin/rabbitmqctl && ! /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 2014-03-12 12:07:43 +0000
+++ etc/init/maas-txlongpoll.conf 2014-04-04 11:08:30 +0000
@@ -15,7 +15,7 @@
env longpoll_vhost="/maas_longpoll"
pre-start script
- if -f /usr/sbin/rabbitmqctl && ! /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"
=== added file 'etc/init/neutron-metering-agent.conf'
--- etc/init/neutron-metering-agent.conf 1970-01-01 00:00:00 +0000
+++ etc/init/neutron-metering-agent.conf 2014-04-04 11:08:30 +0000
@@ -0,0 +1,19 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron Metering 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-metering-agent -- \
+ --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metering_agent.ini \
+ --log-file=/var/log/neutron/metering_agent.log
=== added file 'etc/init/neutron-vpn-agent.conf'
--- etc/init/neutron-vpn-agent.conf 1970-01-01 00:00:00 +0000
+++ etc/init/neutron-vpn-agent.conf 2014-04-04 11:08:30 +0000
@@ -0,0 +1,19 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron VPN 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-vpn-agent -- \
+ --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
+ --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/vpn_agent.log
=== modified file 'etc/init/plymouth-upstart-bridge.conf'
--- etc/init/plymouth-upstart-bridge.conf 2013-11-18 12:42:03 +0000
+++ etc/init/plymouth-upstart-bridge.conf 2014-04-04 11:08:30 +0000
@@ -5,9 +5,12 @@
description "bridge from Upstart state changes to Plymouth"
-start on (started dbus
+respawn
+
+start on (startup
or runlevel [06])
-stop on stopping plymouth
+stop on (stopping plymouth
+ or stopping plymouth-shutdown)
console output
=== added file 'etc/init/plymouth-upstart-bridge.override'
--- etc/init/plymouth-upstart-bridge.override 1970-01-01 00:00:00 +0000
+++ etc/init/plymouth-upstart-bridge.override 2014-04-04 11:08:30 +0000
@@ -0,0 +1,1 @@
+manual
=== added file 'etc/init/ssh-keygen.conf'
--- etc/init/ssh-keygen.conf 1970-01-01 00:00:00 +0000
+++ etc/init/ssh-keygen.conf 2014-04-04 11:08:30 +0000
@@ -0,0 +1,10 @@
+start on starting ssh
+
+task
+
+script
+ [ ! -e /etc/ssh/ssh_host_rsa_key ] && \
+ ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa >/dev/null 2>&1
+ [ ! -e /etc/ssh/ssh_host_dsa_key ] && \
+ ssh-keygen -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa >/dev/null 2>&1
+end script
=== added file 'etc/init/ureadahead-other.override'
--- etc/init/ureadahead-other.override 1970-01-01 00:00:00 +0000
+++ etc/init/ureadahead-other.override 2014-04-04 11:08:30 +0000
@@ -0,0 +1,1 @@
+manual
=== modified file 'etc/init/ureadahead-touch.conf'
--- etc/init/ureadahead-touch.conf 2014-03-31 11:07:46 +0000
+++ etc/init/ureadahead-touch.conf 2014-04-04 11:08:30 +0000
@@ -9,16 +9,21 @@
description "Read required files in advance (for touch mountpoints)"
-start on local-filesystems
+start on starting mountall
stop on starting rcS
expect fork
+kill timeout 180
+normal exit 0
+
script
-exec ureadahead --daemon & # for the rootfs itself
+ureadahead --daemon # for the rootfs itself
for pack in /var/lib/ureadahead/*.pack; do
MOUNTPOINT="$(echo "/$(basename $pack)"|\
sed -e 's/\pack$//' -e 's/\./\//g' -e 's/\/$//')"
- [ -d "$MOUNTPOINT" ] && exec ureadahead --daemon $MOUNTPOINT &
+ [ -d "$MOUNTPOINT" ] && ureadahead --daemon $MOUNTPOINT
done
end script
+
+pre-stop exec sleep 45
=== added file 'etc/init/ureadahead.override'
--- etc/init/ureadahead.override 1970-01-01 00:00:00 +0000
+++ etc/init/ureadahead.override 2014-04-04 11:08:30 +0000
@@ -0,0 +1,1 @@
+manual
=== removed file 'usr/share/upstart/sessions/indicator-sync.conf'
--- usr/share/upstart/sessions/indicator-sync.conf 2014-02-11 12:08:05 +0000
+++ usr/share/upstart/sessions/indicator-sync.conf 1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-description "Indicator Sync Backend"
-
-start on indicators-loaded or indicator-services-start
-stop on desktop-end or indicator-services-end
-
-respawn
-
-# limit to two times in a five second period
-respawn limit 2 5
-
-pre-start script
- # The sync indicator shouldn't be on the greeter
- if [ "${USER}" = "lightdm" ]; then
- stop
- fi
-end script
-
-exec /usr/lib/i386-linux-gnu/indicator-sync/indicator-sync-service
=== added file 'usr/share/upstart/sessions/media-hub.override'
--- usr/share/upstart/sessions/media-hub.override 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/media-hub.override 2014-04-04 11:08:30 +0000
@@ -0,0 +1,4 @@
+env CORE_UBUNTU_MEDIA_SERVICE_AUDIO_SINK_NAME=pulsesink
+export CORE_UBUNTU_MEDIA_SERVICE_AUDIO_SINK_NAME
+env CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME=mirsink
+export CORE_UBUNTU_MEDIA_SERVICE_VIDEO_SINK_NAME
=== modified file 'usr/share/upstart/sessions/unity8-mir.conf'
--- usr/share/upstart/sessions/unity8-mir.conf 2014-03-31 11:07:46 +0000
+++ usr/share/upstart/sessions/unity8-mir.conf 2014-04-04 11:08:30 +0000
@@ -35,7 +35,11 @@
initctl set-env --global QML2_IMPORT_PATH=/usr/lib/i386-linux-gnu/qt5/imports/Unity-Mir
initctl set-env --global UNITY_INDICATOR_PROFILE=desktop
- gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
+ gdbus call --session \
+ --dest org.freedesktop.DBus \
+ --object-path /org/freedesktop/DBus \
+ --method org.freedesktop.DBus.UpdateActivationEnvironment \
+ "@a{ss} {'QT_QPA_PLATFORM': 'ubuntumirclient', 'MIR_SOCKET': '$MIR_SERVER_FILE'}"
fi
if [ -z "$UNITY_SCOPES_LIST" ]; then
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
