------------------------------------------------------------
revno: 49
committer: Dimitri John Ledkov <[email protected]>
branch nick: upstart-jobs
timestamp: Sat 2014-03-22 12:08:24 +0000
message:
auto update
modified:
etc/init/network-interface-container.conf
etc/init/network-interface.conf
etc/init/networking.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/network-interface-container.conf'
--- etc/init/network-interface-container.conf 2013-11-18 12:42:03 +0000
+++ etc/init/network-interface-container.conf 2014-03-22 12:08:24 +0000
@@ -12,7 +12,7 @@
task
script
case "$CONTAINER" in
- lxc|lxc-libvirt)
+ lxc|lxc-libvirt|openvz)
initctl emit --no-wait net-device-added INTERFACE=lo || true
;;
esac
=== modified file 'etc/init/network-interface.conf'
--- etc/init/network-interface.conf 2013-11-18 12:42:03 +0000
+++ etc/init/network-interface.conf 2014-03-22 12:08:24 +0000
@@ -27,4 +27,4 @@
exec ifup --allow auto $INTERFACE
end script
-post-stop exec ifdown --allow auto $INTERFACE
+post-stop exec ifdown --force --allow auto $INTERFACE
=== modified file 'etc/init/networking.conf'
--- etc/init/networking.conf 2013-11-18 12:42:03 +0000
+++ etc/init/networking.conf 2014-03-22 12:08:24 +0000
@@ -10,15 +10,25 @@
emits deconfiguring-networking
start on (local-filesystems
- and (stopped udevtrigger or container)) or runlevel [2345]
+ and (stopped udevtrigger or container)) or runlevel [2345] or stopped networking RESULT=failed PROCESS=post-stop EXIT_STATUS=100
stop on unmounted-remote-filesystems
pre-start script
+ if [ "$UPSTART_EVENTS" = "stopped" ] && [ "$UPSTART_JOB" = "networking" ] && [ "$EXIT_STATUS" = "100" ]; then
+ exit 0
+ fi
+
mkdir -p /run/network
ifup -a
end script
post-stop script
+ if [ -z "$UPSTART_STOP_EVENTS" ]; then
+ echo "Stopping or restarting the networking job is not supported."
+ echo "Use ifdown & ifup to reconfigure desired interface."
+ exit 100
+ fi
+
log_warning_msg() {
echo $*
}
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
