------------------------------------------------------------
revno: 50
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Mon 2014-03-31 12:07:46 +0100
message:
auto update
added:
etc/init/cloud-installer.conf
etc/init/enable-cpu-hotplugging.conf
etc/init/hv-fcopy-daemon.conf
etc/init/hv-kvp-daemon.conf
etc/init/hv-vss-daemon.conf
etc/init/no-cpu-hotplug.conf
etc/init/rbdmap.conf
etc/init/ureadahead-touch.conf
usr/share/upstart/sessions/telephony-service-indicator.conf
usr/share/upstart/sessions/ubuntu-push-client.conf
modified:
etc/init/ceph-osd.conf
etc/init/cgmanager.conf
etc/init/cgproxy.conf
usr/share/upstart/sessions/im-config.conf
usr/share/upstart/sessions/indicator-application.conf
usr/share/upstart/sessions/indicator-datetime.conf
usr/share/upstart/sessions/ssh-agent.conf
usr/share/upstart/sessions/unity-greeter-session-broadcast-session.conf
usr/share/upstart/sessions/unity8-mir.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/ceph-osd.conf'
--- etc/init/ceph-osd.conf 2013-11-18 12:42:03 +0000
+++ etc/init/ceph-osd.conf 2014-03-31 11:07:46 +0000
@@ -16,12 +16,15 @@
install -d -m0755 /var/run/ceph
update="$(ceph-conf --cluster=${cluster:-ceph} --name=osd.$id --lookup osd_crush_update_on_start || :)"
- if [ "${update:-1}" = "1" -o "{$update:-1}" = "true" ]; then
- # update location in crush; put in some suitable defaults on the
- # command line, ceph.conf can override what it wants
- location="$(ceph-conf --cluster=${cluster:-ceph} --name=osd.$id --lookup osd_crush_location || :)"
+ if [ "${update:-1}" = "1" -o "${update:-1}" = "true" ]; then
+ # update location in crush
+ hook="$(ceph-conf --cluster=${cluster:-ceph} --name=osd.$id --lookup osd_crush_location_hook || :)"
+ if [ -z "$hook" ]; then
+ hook="/usr/bin/ceph-crush-location"
+ fi
+ location="$($hook --cluster ${cluster:-ceph} --id $id --type osd)"
weight="$(ceph-conf --cluster=${cluster:-ceph} --name=osd.$id --lookup osd_crush_initial_weight || :)"
- defaultweight=`df /var/lib/ceph/osd/${cluster:-ceph}-$id/ | tail -1 | awk '{ d= $2/1073741824 ; r = sprintf("%.2f", d); print r }'`
+ defaultweight=`df -P -k /var/lib/ceph/osd/${cluster:-ceph}-$id/ | tail -1 | awk '{ d= $2/1073741824 ; r = sprintf("%.2f", d); print r }'`
ceph \
--cluster="${cluster:-ceph}" \
--name="osd.$id" \
@@ -30,8 +33,6 @@
-- \
"$id" \
"${weight:-${defaultweight:-1}}" \
- root=default \
- host="$(hostname -s)" \
$location
fi
=== modified file 'etc/init/cgmanager.conf'
--- etc/init/cgmanager.conf 2014-02-20 12:08:32 +0000
+++ etc/init/cgmanager.conf 2014-03-31 11:07:46 +0000
@@ -27,5 +27,5 @@
script
[ -r /etc/default/cgmanager ] && . /etc/default/cgmanager
- exec cgmanager $cgmanager_opts $cgm_extra_mounts
+ exec /sbin/cgmanager $cgmanager_opts $cgm_extra_mounts
end script
=== modified file 'etc/init/cgproxy.conf'
--- etc/init/cgproxy.conf 2014-02-06 12:07:42 +0000
+++ etc/init/cgproxy.conf 2014-03-31 11:07:46 +0000
@@ -23,5 +23,5 @@
script
[ -r /etc/default/cgmanager ] && . /etc/default/cgmanager
- exec cgproxy $cgmanager_opts
+ exec /sbin/cgproxy $cgmanager_opts
end script
=== added file 'etc/init/cloud-installer.conf'
--- etc/init/cloud-installer.conf 1970-01-01 00:00:00 +0000
+++ etc/init/cloud-installer.conf 2014-03-31 11:07:46 +0000
@@ -0,0 +1,26 @@
+description "Cloud install"
+author "Robert Ayres <[email protected]>"
+
+start on (local-filesystems and stopped rc RUNLEVEL=[2345])
+stop on runlevel [!2345]
+
+respawn
+
+script
+ . /etc/default/locale
+ export LANG LANGUAGE
+
+ INSTALL_USER=$(debconf-get-selections \
+ | awk -F "\t" '($1 == "cloud-install-multi") && ($2 == "cloud-installer/install-user") { print $4 }')
+
+ if [ ! -e /etc/.cloud-installed ]; then
+ export HOME=/root
+ user=root
+ cmd=/usr/bin/cloud-install
+ else
+ export HOME=/home/$INSTALL_USER
+ user=$INSTALL_USER
+ cmd=/usr/bin/cloud-status
+ fi
+ exec /sbin/rungetty -u "$user" -g "$user" -w "$HOME" tty1 $cmd
+end script
=== added file 'etc/init/enable-cpu-hotplugging.conf'
--- etc/init/enable-cpu-hotplugging.conf 1970-01-01 00:00:00 +0000
+++ etc/init/enable-cpu-hotplugging.conf 2014-03-31 11:07:46 +0000
@@ -0,0 +1,12 @@
+description "enable cpu hotplugging after Ubuntu Touch boot"
+
+start on runlevel [2345]
+
+task
+
+script
+sleep 60
+for cpu in /sys/devices/system/cpu/cpu?/online; do
+ chmod 644 $cpu
+done
+end script
=== added file 'etc/init/hv-fcopy-daemon.conf'
--- etc/init/hv-fcopy-daemon.conf 1970-01-01 00:00:00 +0000
+++ etc/init/hv-fcopy-daemon.conf 2014-03-31 11:07:46 +0000
@@ -0,0 +1,22 @@
+# On Azure/Hyper-V systems start the hv_fcopy_daemon
+#
+description "Hyper-V File Copy Protocol Daemon"
+author "Andy Whitcroft <[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_FCOPY_DAEMON" -eq 0 ] && { stop; exit 0; }
+ if [ -d /sys/class/dmi/id/. ]; then
+ read company </sys/class/dmi/id/sys_vendor
+ read product </sys/class/dmi/id/product_name
+ [ "$company:$product" = 'Microsoft Corporation:Virtual Machine' ] || { stop; exit 0; }
+ fi
+end script
+
+exec /usr/sbin/hv_fcopy_daemon
=== added file 'etc/init/hv-kvp-daemon.conf'
--- etc/init/hv-kvp-daemon.conf 1970-01-01 00:00:00 +0000
+++ etc/init/hv-kvp-daemon.conf 2014-03-31 11:07:46 +0000
@@ -0,0 +1,22 @@
+# 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_KVP_DAEMON" = 0 ] && { stop; exit 0; }
+ if [ -d /sys/class/dmi/id/. ]; then
+ read company </sys/class/dmi/id/sys_vendor
+ read product </sys/class/dmi/id/product_name
+ [ "$company:$product" = 'Microsoft Corporation:Virtual Machine' ] || { stop; exit 0; }
+ fi
+end script
+
+exec /usr/sbin/hv_kvp_daemon
=== added file 'etc/init/hv-vss-daemon.conf'
--- etc/init/hv-vss-daemon.conf 1970-01-01 00:00:00 +0000
+++ etc/init/hv-vss-daemon.conf 2014-03-31 11:07:46 +0000
@@ -0,0 +1,22 @@
+# 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-kvp-daemon-init" ]; then
+ . /etc/default/hv-kvp-daemon-init
+ fi
+ [ "$RUN_VSS_DAEMON" -eq 0 ] && { stop; exit 0; }
+ if [ -d /sys/class/dmi/id/. ]; then
+ read company </sys/class/dmi/id/sys_vendor
+ read product </sys/class/dmi/id/product_name
+ [ "$company:$product" = 'Microsoft Corporation:Virtual Machine' ] || { stop; exit 0; }
+ fi
+end script
+
+exec /usr/sbin/hv_vss_daemon
=== added file 'etc/init/no-cpu-hotplug.conf'
--- etc/init/no-cpu-hotplug.conf 1970-01-01 00:00:00 +0000
+++ etc/init/no-cpu-hotplug.conf 2014-03-31 11:07:46 +0000
@@ -0,0 +1,11 @@
+description "disable cpu hotplugging during Ubuntu Touch boot"
+
+start on local-filesystems
+
+task
+
+script
+for cpu in /sys/devices/system/cpu/cpu?/online; do
+ chmod 444 $cpu
+done
+end script
=== added file 'etc/init/rbdmap.conf'
--- etc/init/rbdmap.conf 1970-01-01 00:00:00 +0000
+++ etc/init/rbdmap.conf 2014-03-31 11:07:46 +0000
@@ -0,0 +1,48 @@
+# rbdmap - Ceph RBD Mapping
+#
+# This script does not manage mount and unmount fs which depends on rbd device.
+# You should use _netdev option in fstab to mount and umount in the correct order.
+
+description "ceph rbd mapping"
+
+start on (started networking
+ and remote-filesystems)
+stop on unmounted-remote-filesystems
+
+env RBDMAPFILE="/etc/ceph/rbdmap"
+
+pre-start script
+ if [ ! -f "$RBDMAPFILE" ]; then
+ exit 0
+ fi
+
+ while read DEV PARAMS; do
+ case "$DEV" in
+ ""|\#*)
+ continue
+ ;;
+ */*)
+ ;;
+ *)
+ DEV=rbd/$DEV
+ ;;
+ esac
+ for PARAM in $(echo $PARAMS | tr ',' '\n'); do
+ CMDPARAMS="$CMDPARAMS --$(echo $PARAM | tr '=' ' ')"
+ done
+ if [ ! -b /dev/rbd/$DEV ]; then
+ echo "rbd map $DEV"
+ rbd map $DEV $CMDPARAMS
+ fi
+ done < $RBDMAPFILE
+end script
+
+post-stop script
+ if ls /dev/rbd[0-9]* >/dev/null 2>&1; then
+ for DEV in /dev/rbd[0-9]*; do
+ echo "rbd unmap $DEV"
+ rbd unmap $DEV
+ done
+ fi
+end script
+
=== added file 'etc/init/ureadahead-touch.conf'
--- etc/init/ureadahead-touch.conf 1970-01-01 00:00:00 +0000
+++ etc/init/ureadahead-touch.conf 2014-03-31 11:07:46 +0000
@@ -0,0 +1,24 @@
+# ureadahead - Read required files in advance for touch mountpoints
+#
+# Runs the über-readahead daemon which reads data about files required
+# during boot and reads them into the page cache in advance of their
+# use.
+# Since on touch devices all mounting happens in initrd, mountall does
+# not emit the right mount events for us so we iterate over the .pack
+# files instead to preload files on boot.
+
+description "Read required files in advance (for touch mountpoints)"
+
+start on local-filesystems
+stop on starting rcS
+
+expect fork
+
+script
+exec 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 &
+done
+end script
=== modified file 'usr/share/upstart/sessions/im-config.conf'
--- usr/share/upstart/sessions/im-config.conf 2014-01-24 12:08:44 +0000
+++ usr/share/upstart/sessions/im-config.conf 2014-03-31 11:07:46 +0000
@@ -11,6 +11,9 @@
# 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
=== modified file 'usr/share/upstart/sessions/indicator-application.conf'
--- usr/share/upstart/sessions/indicator-application.conf 2013-12-06 17:20:05 +0000
+++ usr/share/upstart/sessions/indicator-application.conf 2014-03-31 11:07:46 +0000
@@ -3,13 +3,14 @@
# 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
+start on indicator-services-start and xsession SESSION=ubuntu
stop on desktop-end or indicator-services-end
emits appindicators-start appindicators-end
respawn
+respawn limit 2 10
-exec /usr/lib/i386-linux-gnu/indicator-application-service
+exec /usr/lib/i386-linux-gnu/indicator-application/indicator-application-service
pre-stop exec initctl emit appindicators-end
=== modified file 'usr/share/upstart/sessions/indicator-datetime.conf'
--- usr/share/upstart/sessions/indicator-datetime.conf 2013-12-06 17:20:05 +0000
+++ usr/share/upstart/sessions/indicator-datetime.conf 2014-03-31 11:07:46 +0000
@@ -1,8 +1,9 @@
description "Indicator Date & Time Backend"
-start on indicators-loaded or indicator-services-start
+start on indicator-services-start
stop on desktop-end or indicator-services-end
respawn
+respawn limit 2 10
exec /usr/lib/i386-linux-gnu/indicator-datetime/indicator-datetime-service
=== modified file 'usr/share/upstart/sessions/ssh-agent.conf'
--- usr/share/upstart/sessions/ssh-agent.conf 2013-11-18 12:42:03 +0000
+++ usr/share/upstart/sessions/ssh-agent.conf 2014-03-31 11:07:46 +0000
@@ -6,14 +6,18 @@
pre-start script
[ -e /etc/X11/Xsession.options ] || { stop; exit 0; }
grep -q "^use-ssh-agent$" /etc/X11/Xsession.options || { stop; exit 0; }
+ [ -z "$SSH_AUTH_SOCK" ] || { stop; exit 0; }
eval "$(ssh-agent)" >/dev/null
initctl set-env --global SSH_AUTH_SOCK=$SSH_AUTH_SOCK
initctl set-env --global SSH_AGENT_PID=$SSH_AGENT_PID
+ initctl set-env --global SSH_AGENT_LAUNCHER=upstart
end script
post-stop script
+ [ "$SSH_AGENT_LAUNCHER" = upstart ] || exit 0
kill $SSH_AGENT_PID 2>/dev/null || true
initctl unset-env --global SSH_AUTH_SOCK
initctl unset-env --global SSH_AGENT_PID
+ initctl unset-env --global SSH_AGENT_LAUNCHER
end script
=== added file 'usr/share/upstart/sessions/telephony-service-indicator.conf'
--- usr/share/upstart/sessions/telephony-service-indicator.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/telephony-service-indicator.conf 2014-03-31 11:07:46 +0000
@@ -0,0 +1,9 @@
+description "telephony-service-indicator"
+author "Tiago Salem Herrmann <[email protected]>"
+
+start on started unity8
+stop on session-end
+
+respawn
+
+exec /usr/bin/telephony-service-indicator
=== added file 'usr/share/upstart/sessions/ubuntu-push-client.conf'
--- usr/share/upstart/sessions/ubuntu-push-client.conf 1970-01-01 00:00:00 +0000
+++ usr/share/upstart/sessions/ubuntu-push-client.conf 2014-03-31 11:07:46 +0000
@@ -0,0 +1,6 @@
+description "Starts the ubuntu push notifications client side daemon"
+
+start on dbus
+stop on runlevel [06]
+
+exec /usr/lib/ubuntu-push-client/ubuntu-push-client
=== modified file 'usr/share/upstart/sessions/unity-greeter-session-broadcast-session.conf'
--- usr/share/upstart/sessions/unity-greeter-session-broadcast-session.conf 2014-03-16 12:08:37 +0000
+++ usr/share/upstart/sessions/unity-greeter-session-broadcast-session.conf 2014-03-31 11:07:46 +0000
@@ -3,10 +3,8 @@
task
-emits application-start
-
#TODO: Check GSettings Key
-start on dbus BUS=system SIGNAL="StartApplication" INTERFACE="com.canonical.Unity.Greeter.Broadcast" OBJPATH="/com/canonical/Unity/Greeter/Broadcast"
+start on dbus BUS=system SIGNAL="StartUrl" INTERFACE="com.canonical.Unity.Greeter.Broadcast" OBJPATH="/com/canonical/Unity/Greeter/Broadcast"
pre-start script
if [ -z $ARG0 ] ; then
@@ -30,4 +28,4 @@
fi
end script
-exec initctl emit application-start APP_ID=${ARG1}
+exec url-dispatcher ${ARG1}
=== modified file 'usr/share/upstart/sessions/unity8-mir.conf'
--- usr/share/upstart/sessions/unity8-mir.conf 2014-03-12 12:07:43 +0000
+++ usr/share/upstart/sessions/unity8-mir.conf 2014-03-31 11:07:46 +0000
@@ -1,5 +1,7 @@
description "Unity Shell v8 on Mir"
+emits scope-ui-starting
+
start on xsession SESSION=unity8-mir and started dbus
stop on desktop-end
@@ -31,7 +33,19 @@
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
+ 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'}"
+ fi
+
+ if [ -z "$UNITY_SCOPES_LIST" ]; then
+ initctl set-env UNITY_SCOPES_LIST="scopes;clickscope;musicaggregator;videoaggregator"
+ fi
+
+ initctl emit scope-ui-starting
end script
exec ${BINARY:-unity8} $ARGS
+
+pre-stop exec initctl emit --no-wait desktop-end
+post-stop exec dbus-send --type=method_call --address=$UPSTART_SESSION /com/ubuntu/Upstart com.ubuntu.Upstart0_6.EndSession
=== modified file 'usr/share/upstart/sessions/unity8.conf'
--- usr/share/upstart/sessions/unity8.conf 2014-03-12 12:07:43 +0000
+++ usr/share/upstart/sessions/unity8.conf 2014-03-31 11:07:46 +0000
@@ -1,10 +1,12 @@
description "Unity Shell v8"
author "Ricardo Mendoza <[email protected]>"
+emits scope-ui-starting
+
start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus
stop on desktop-end
-kill timeout 30
+kill timeout 120
respawn
expect stop
@@ -29,10 +31,17 @@
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
+ if [ -z "$UNITY_SCOPES_LIST" ]; then
+ # FIXME: remove once we have this in dconf
+ initctl set-env UNITY_SCOPES_LIST="scopes;clickscope;musicaggregator;videoaggregator"
+ fi
+
# Remove the socket if still there
if [ -S "$MIR_SERVER_FILE" ]; then
rm "$MIR_SERVER_FILE"
fi
+
+ initctl emit scope-ui-starting
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
