cloud-init-dev team mailing list archive

[Chad Smith <chad.smith@xxxxxxxxxxxxx>]

Diff comments:

> diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py
> index f49386e..32d51e8 100644
> --- a/cloudinit/config/cc_disk_setup.py
> +++ b/cloudinit/config/cc_disk_setup.py
> @@ -936,14 +938,14 @@ def mkfs(fs_cfg):
>          if overwrite or device_type(device) == "disk":
>              fs_cmd.append(lookup_force_flag(fs_type))
>  
> -    # Add the extends FS options
> -    if fs_opts:
> -        fs_cmd.extend(fs_opts)
> +        # Add the extends FS options

I haven't glanced at this scope change here with the new indents. trying to think about the implications of not handling this in other cases.

> +        if fs_opts:
> +            fs_cmd.extend(fs_opts)
>  
>      LOG.debug("Creating file system %s on %s", label, device)
> -    LOG.debug("     Using cmd: %s", " ".join(fs_cmd))
> +    LOG.debug("     Using cmd: %s", fs_cmd if shell else " ".join(fs_cmd))
>      try:
> -        util.subp(fs_cmd)
> +        util.subp(fs_cmd, shell=shell)
>      except Exception as e:
>          raise Exception("Failed to exec of '%s':\n%s" % (fs_cmd, e))
>  


-- 
https://code.launchpad.net/~paul-meyer/cloud-init/+git/cloud-init/+merge/323532
Your team cloud init development team is requested to review the proposed merge of ~paul-meyer/cloud-init:bug-1687712 into cloud-init:master.