summaryrefslogtreecommitdiff
path: root/cloudinit/util.py
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-09-15 20:27:31 -0400
committerScott Moser <smoser@ubuntu.com>2014-09-15 20:27:31 -0400
commit5d51578e5aaa3fd96eb7505a0d625abe65553a67 (patch)
tree2806781d0a1c718cf5adc7c43dd41243a17f5900 /cloudinit/util.py
parent6093b8b2733814b9265494c47f4268167c9491ab (diff)
parentbea35b7685978804557aada44c819c536ab209b3 (diff)
downloadvyos-cloud-init-5d51578e5aaa3fd96eb7505a0d625abe65553a67.tar.gz
vyos-cloud-init-5d51578e5aaa3fd96eb7505a0d625abe65553a67.zip
resizefs: fix backgrounded resizing
add kwargs to fork_cb, and utilize that to call log_time and pass through the provided args to resize_cmd. LP: #1338614
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r--cloudinit/util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py
index bdb0f268..946059e9 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -191,11 +191,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)
except:
logexc(LOG, "Failed forking and calling callback %s",