diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-07-27 16:53:50 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-07-27 16:53:50 -0400 |
| commit | 81a9f17a71f9cac4c78ea5ce80b4a96e3bbb9324 (patch) | |
| tree | ed9b2fe43f65d2e8fc705020d7cdd4c6307b8988 /cloudinit/config/cc_disk_setup.py | |
| parent | 22cb92421234c31b783ed9df01439c734535ba01 (diff) | |
| parent | d68b340f8a6abf40f4d5cb546c91122c8856aa83 (diff) | |
| download | vyos-cloud-init-81a9f17a71f9cac4c78ea5ce80b4a96e3bbb9324.tar.gz vyos-cloud-init-81a9f17a71f9cac4c78ea5ce80b4a96e3bbb9324.zip | |
merge from trunk
Diffstat (limited to 'cloudinit/config/cc_disk_setup.py')
| -rw-r--r-- | cloudinit/config/cc_disk_setup.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py index e2ce6db4..d5b0d1d7 100644 --- a/cloudinit/config/cc_disk_setup.py +++ b/cloudinit/config/cc_disk_setup.py @@ -648,6 +648,8 @@ def mkpart(device, definition): table_type: Which partition table to use, defaults to MBR device: the device to work on. """ + # ensure that we get a real device rather than a symbolic link + device = os.path.realpath(device) LOG.debug("Checking values for %s definition" % device) overwrite = definition.get('overwrite', False) @@ -745,6 +747,9 @@ def mkfs(fs_cfg): fs_replace = fs_cfg.get('replace_fs', False) overwrite = fs_cfg.get('overwrite', False) + # ensure that we get a real device rather than a symbolic link + device = os.path.realpath(device) + # This allows you to define the default ephemeral or swap LOG.debug("Checking %s against default devices", device) |