diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
| commit | 5994f3bc480c918d8756ab0cb8ecfa34975eb307 (patch) | |
| tree | 893c47ee8e3523982081f600bf770ffd68a54ac7 /cloudinit/config/cc_disk_setup.py | |
| parent | 1355ce5e2b53b063cde2825b6df9de1cdd2b1797 (diff) | |
| parent | d75a912fb375afbab055db3178966d1f83b44143 (diff) | |
| download | vyos-cloud-init-5994f3bc480c918d8756ab0cb8ecfa34975eb307.tar.gz vyos-cloud-init-5994f3bc480c918d8756ab0cb8ecfa34975eb307.zip | |
merge trunk at 0.7.7~bzr1200
Diffstat (limited to 'cloudinit/config/cc_disk_setup.py')
| -rw-r--r-- | cloudinit/config/cc_disk_setup.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py index 0ecc2e4c..bbaf9646 100644 --- a/cloudinit/config/cc_disk_setup.py +++ b/cloudinit/config/cc_disk_setup.py @@ -847,9 +847,9 @@ def mkfs(fs_cfg): if label: fs_cmd.extend(["-L", label]) - # File systems that support the -F flag - if not fs_cmd and (overwrite or device_type(device) == "disk"): - fs_cmd.append(lookup_force_flag(fs_type)) + # File systems that support the -F flag + if overwrite or device_type(device) == "disk": + fs_cmd.append(lookup_force_flag(fs_type)) # Add the extends FS options if fs_opts: |