diff options
author | Ben Howard <ben.howard@canonical.com> | 2013-08-20 09:58:30 -0600 |
---|---|---|
committer | Ben Howard <ben.howard@canonical.com> | 2013-08-20 09:58:30 -0600 |
commit | 89d58c94d59c62dddea3f77b7a805c1afa2ca955 (patch) | |
tree | 6b7cd86a373706730f0ec11f06517fc2a003f7c9 /bin | |
parent | e683ab2baa3e67614edcd409122bd1aec99737e0 (diff) | |
parent | b2ee0966793f3a9c7d8e92ce1c13b9583a9a76e7 (diff) | |
download | vyos-cloud-init-89d58c94d59c62dddea3f77b7a805c1afa2ca955.tar.gz vyos-cloud-init-89d58c94d59c62dddea3f77b7a805c1afa2ca955.zip |
Updated merge proposal with current tree
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/cloud-init | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/cloud-init b/bin/cloud-init index c5a5b949..b4f9fd07 100755 --- a/bin/cloud-init +++ b/bin/cloud-init @@ -502,7 +502,9 @@ def main(): signal_handler.attach_handlers() (name, functor) = args.action - return functor(name, args) + + return util.log_time(logfunc=LOG.debug, msg="cloud-init mode '%s'" % name, + get_uptime=True, func=functor, args=(name, args)) if __name__ == '__main__': |