summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2013-03-04 14:46:01 -0500
committerScott Moser <smoser@ubuntu.com>2013-03-04 14:46:01 -0500
commit2a64b4e7a702933ec5e5a726155cc7acbe4d8144 (patch)
tree4f9636df527ae904a54d1a082049cf3acf93f556 /ChangeLog
parent7ec5f0fcce2dad57e7f336264a50b000eeec3ed0 (diff)
parentbcf04395be323c60b013e531ef3bf32b722a780a (diff)
downloadvyos-cloud-init-2a64b4e7a702933ec5e5a726155cc7acbe4d8144.tar.gz
vyos-cloud-init-2a64b4e7a702933ec5e5a726155cc7acbe4d8144.zip
upstart/cloud-init-nonet.conf: handle SIGTERM gracefully
this fixes a confusing message, most commonly found in /var/log/dmesg or seen on log screens: init: cloud-init-nonet main process (307) killed by TERM signal This was actually *expected* as the upstart job was supposed to block until networking came up, and the SIGTERM was sent by upstart. That said, the message was confusing. Now, instead we will see something like cloud-init-nonet[6.54]: waiting 10 seconds for network device cloud-init-nonet[12.13]: static networking is now up Which is much nicer. In the event that networking does not come up you'll see: cloud-init-nonet[X.Y]: gave up waiting for a network device. LP: #1015223
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fcde14fc..110cdec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -502,4 +502,6 @@
- do not require public key if private is given in ssh cloud-config
(LP: #648905)
- fix issue when writing ssh keys to .ssh/authorized_keys (LP: #1136343)
+ - upstart: cloud-init-nonet.conf trap the TERM signal, so that dmesg or other
+ output does not get a 'killed by TERM signal' message.
# vi: syntax=text textwidth=79