diff options
| author | Jay Faulkner <jay@jvf.cc> | 2014-09-15 14:39:57 -0700 |
|---|---|---|
| committer | Jay Faulkner <jay@jvf.cc> | 2014-09-15 14:39:57 -0700 |
| commit | fa7b60d5269cb76c4205b4709bd3048e14b9a0c7 (patch) | |
| tree | 2d40f130216b7a3b1ee80d193170e5138d543b53 /cloudinit/util.py | |
| parent | 6386accbf4933ecb368d2f32b7db95583e03b525 (diff) | |
| download | vyos-cloud-init-fa7b60d5269cb76c4205b4709bd3048e14b9a0c7.tar.gz vyos-cloud-init-fa7b60d5269cb76c4205b4709bd3048e14b9a0c7.zip | |
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.
Diffstat (limited to 'cloudinit/util.py')
| -rw-r--r-- | cloudinit/util.py | 4 |
1 files changed, 2 insertions, 2 deletions
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", |