summaryrefslogtreecommitdiff
path: root/bin/cloud-init
diff options
context:
space:
mode:
authorVlastimil Holer <vlastimil.holer@gmail.com>2012-12-19 18:03:03 +0100
committerVlastimil Holer <vlastimil.holer@gmail.com>2012-12-19 18:03:03 +0100
commit8dd9678d97a822e477915c150d528096a83c9777 (patch)
treea9b5708edd9d448508abf00abdd9b7bdeba16541 /bin/cloud-init
parenta9939fe768e04d52fe530c7467357d79b78a21f4 (diff)
parent3569e71a1579b97f4e33fb46ab3fcef08a4ddad4 (diff)
downloadvyos-cloud-init-8dd9678d97a822e477915c150d528096a83c9777.tar.gz
vyos-cloud-init-8dd9678d97a822e477915c150d528096a83c9777.zip
Merged trunk lp:cloud-init
Diffstat (limited to 'bin/cloud-init')
-rwxr-xr-xbin/cloud-init7
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/cloud-init b/bin/cloud-init
index 1f017475..c5a5b949 100755
--- a/bin/cloud-init
+++ b/bin/cloud-init
@@ -33,8 +33,12 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
if os.path.exists(os.path.join(possible_topdir, "cloudinit", "__init__.py")):
sys.path.insert(0, possible_topdir)
+from cloudinit import patcher
+patcher.patch()
+
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 +498,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)