summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@yahoo-inc.com>2012-09-19 16:35:51 -0400
committerScott Moser <smoser@ubuntu.com>2012-09-19 16:35:51 -0400
commit89f54bba6a7cc2b1d0d4b04dd1caf477bee72ea2 (patch)
treecb1133df2eebe43e65af064747b767e528a430a3 /bin
parenta2508f662245ab38a5200188e54e228005d56bba (diff)
parentcef4e846797ed7aee29e18b00810887c67591abc (diff)
downloadvyos-cloud-init-89f54bba6a7cc2b1d0d4b04dd1caf477bee72ea2.tar.gz
vyos-cloud-init-89f54bba6a7cc2b1d0d4b04dd1caf477bee72ea2.zip
add general signal handlers
A cloud-init job (user-data) might invoke /sbin/reboot or in some other way end up killing cloud-init. Rather than spewing the stack trace, we just print a nicer message.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/cloud-init4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/cloud-init b/bin/cloud-init
index 1f017475..a6ad14a6 100755
--- a/bin/cloud-init
+++ b/bin/cloud-init
@@ -35,6 +35,7 @@ if os.path.exists(os.path.join(possible_topdir, "cloudinit", "__init__.py")):
from cloudinit import log as logging
from cloudinit import netinfo
+from cloudinit import signal_handler
from cloudinit import sources
from cloudinit import stages
from cloudinit import templater
@@ -494,6 +495,9 @@ def main():
if args.debug:
logging.setupBasicLogging()
+ # Setup signal handlers before running
+ signal_handler.attach_handlers()
+
(name, functor) = args.action
return functor(name, args)