From fa7b60d5269cb76c4205b4709bd3048e14b9a0c7 Mon Sep 17 00:00:00 2001 From: Jay Faulkner Date: Mon, 15 Sep 2014 14:39:57 -0700 Subject: Fix bug 1338614 util.log_time()'s return value was what was being sent to fork_cb. This means the resize ran in parallel and the call to fork_cb threw a traceback (trying to call Nonetype). By permitting fork_cb to take kwargs, and using the correct method syntax, this now forks and resizes in the background as appropriate. --- cloudinit/util.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cloudinit/util.py') diff --git a/cloudinit/util.py b/cloudinit/util.py index 0821901a..f0fa7a19 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -193,11 +193,11 @@ def ExtendedTemporaryFile(**kwargs): return fh -def fork_cb(child_cb, *args): +def fork_cb(child_cb, *args, **kwargs): fid = os.fork() if fid == 0: try: - child_cb(*args) + child_cb(*args, **kwargs) os._exit(0) # pylint: disable=W0212 except: logexc(LOG, "Failed forking and calling callback %s", -- cgit v1.2.3