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

3 files changed, 5 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d0d771e..b33258d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@
  - resizefs: first check that device is writable.
  - configdrive: fix reading of vendor data to be like metadata service reader.
    [Jay Faulkner]
+ - resizefs: fix broken background resizing [Jay Faulkner] (LP: #1338614)
 0.7.5:
  - open 0.7.5
  - Add a debug log message around import failures
diff --git a/cloudinit/config/cc_resizefs.py b/cloudinit/config/cc_resizefs.py
index 7e796228..cbc07853 100644
--- a/cloudinit/config/cc_resizefs.py
+++ b/cloudinit/config/cc_resizefs.py
@@ -162,8 +162,8 @@ def handle(name, cfg, _cloud, log, args):
         # Fork to a child that will run
         # the resize command
         util.fork_cb(
-            util.log_time(logfunc=log.debug, msg="backgrounded Resizing",
-                func=do_resize, args=(resize_cmd, log)))
+            util.log_time, logfunc=log.debug, msg="backgrounded Resizing",
+            func=do_resize, args=(resize_cmd, log))
     else:
         util.log_time(logfunc=log.debug, msg="Resizing",
             func=do_resize, args=(resize_cmd, log))
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",