------------------------------------------------------------
revno: 39
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Thu 2014-02-20 12:08:32 +0000
message:
auto update
removed:
usr/share/upstart/sessions/gnome-session.conf
modified:
etc/init/cgmanager.conf
etc/init/lxc-net.conf
usr/share/upstart/sessions/unity-settings-daemon.conf
usr/share/upstart/sessions/update-notifier-crash.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/cgmanager.conf'
--- etc/init/cgmanager.conf 2014-02-14 12:07:52 +0000
+++ etc/init/cgmanager.conf 2014-02-20 12:08:32 +0000
@@ -12,6 +12,11 @@
# /etc/default/cgmanager and set cgmanager_opts="--debug"
env cgmanager_opts=""
+# unbound subsystems cgmanager should mount. If you need to add more,
+# make the list comma-separated, for instance:
+# env cgm_extra_mounts="-m name=systemd,name=yyy"
+env cgm_extra_mounts="-m name=systemd"
+
pre-start script
# check whether we should start a cgproxy or a cgmanager
if cgproxy --check-master; then
@@ -22,5 +27,5 @@
script
[ -r /etc/default/cgmanager ] && . /etc/default/cgmanager
- exec cgmanager $cgmanager_opts
+ exec cgmanager $cgmanager_opts $cgm_extra_mounts
end script
=== modified file 'etc/init/lxc-net.conf'
--- etc/init/lxc-net.conf 2014-02-14 12:07:52 +0000
+++ etc/init/lxc-net.conf 2014-02-20 12:08:32 +0000
@@ -4,7 +4,7 @@
start on starting lxc
stop on stopped lxc
-env USE_LXC_BRIDGE="false"
+env USE_LXC_BRIDGE="true"
env LXC_BRIDGE="lxcbr0"
env LXC_ADDR="10.0.3.1"
env LXC_NETMASK="255.255.255.0"
@@ -21,7 +21,7 @@
[ "x$USE_LXC_BRIDGE" = "xtrue" ] || { stop; exit 0; }
use_iptables_lock="-w"
- iptables -w -L -n 2>&1 > /dev/null || use_iptables_lock=""
+ iptables -w -L -n > /dev/null 2>&1 || use_iptables_lock=""
cleanup() {
# dnsmasq failed to start, clean up the bridge
iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
@@ -74,7 +74,7 @@
if [ -d /sys/class/net/${LXC_BRIDGE} ]; then
use_iptables_lock="-w"
- iptables -w -L -n 2>&1 > /dev/null || use_iptables_lock=""
+ iptables -w -L -n > /dev/null 2>&1 || use_iptables_lock=""
ifconfig ${LXC_BRIDGE} down
iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT
=== removed file 'usr/share/upstart/sessions/gnome-session.conf'
--- usr/share/upstart/sessions/gnome-session.conf 2014-02-09 12:08:51 +0000
+++ usr/share/upstart/sessions/gnome-session.conf 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-description "Gnome Session itself"
-author "Stéphane Graber <[email protected]>"
-
-start on started dbus and xsession SESSIONTYPE=gnome-session
-stop on starting gnome-session INSTANCE!=$DESKTOP_SESSION
-
-env GNOME_DESKTOP_SESSION_ID=this-is-deprecated
-export GNOME_DESKTOP_SESSION_ID
-
-instance $DESKTOP_SESSION
-
-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
-
-# Don't wait to avoid blocking the session from ending.
-pre-stop exec initctl emit --no-wait desktop-end DESKTOP_SESSION=$DESKTOP_SESSION
-
-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/unity-settings-daemon.conf'
--- usr/share/upstart/sessions/unity-settings-daemon.conf 2014-02-09 12:08:51 +0000
+++ usr/share/upstart/sessions/unity-settings-daemon.conf 2014-02-20 12:08:32 +0000
@@ -1,12 +1,8 @@
description "The Unity Settings Daemon"
author "Dimitri John Ledkov <[email protected]>"
-start on started dbus and starting gnome-session
+start on started dbus and starting gnome-session INSTANCE=ubuntu
stop on stopping gnome-session
-pre-start script
- [ "$DESKTOP_SESSION" = "ubuntu" ] || { stop; exit 0; }
-end script
-
respawn
exec /usr/lib/unity-settings-daemon/unity-settings-daemon
=== modified file 'usr/share/upstart/sessions/update-notifier-crash.conf'
--- usr/share/upstart/sessions/update-notifier-crash.conf 2014-01-09 12:08:28 +0000
+++ usr/share/upstart/sessions/update-notifier-crash.conf 2014-02-20 12:08:32 +0000
@@ -15,7 +15,7 @@
echo "$DATE autoreporting enabled exiting"
exit 0
fi
-if [ -r $MATCH ]; then
+if [ -w $MATCH ]; then
/usr/share/apport/apport-gtk
else
SYSTEMCRASH=0
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
