diff options
| author | Scott Moser <smoser@brickies.net> | 2017-04-03 11:52:06 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-04-03 11:52:06 -0400 |
| commit | 3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb (patch) | |
| tree | 678b118605245e5bb1b218565728270702aba5b4 /cloudinit/config/cc_growpart.py | |
| parent | e018fa910fdf0dbf3aa22e59e935461babd205c4 (diff) | |
| parent | 61eb03fef92f435434d974fb46439189ef0b5f97 (diff) | |
| download | vyos-cloud-init-3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb.tar.gz vyos-cloud-init-3b2e493b51153cd5bc1fa91e6ac52f59d41fe3fb.zip | |
merge from master at 0.7.9-90-g61eb03fe
Diffstat (limited to 'cloudinit/config/cc_growpart.py')
| -rw-r--r-- | cloudinit/config/cc_growpart.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py index 832bb3fd..089693e8 100644 --- a/cloudinit/config/cc_growpart.py +++ b/cloudinit/config/cc_growpart.py @@ -247,7 +247,16 @@ def devent2dev(devent): result = util.get_mount_info(devent) if not result: raise ValueError("Could not determine device of '%s' % dev_ent") - return result[0] + dev = result[0] + + container = util.is_container() + + # Ensure the path is a block device. + if (dev == "/dev/root" and not os.path.exists(dev) and not container): + dev = util.rootdev_from_cmdline(util.get_cmdline()) + if dev is None: + raise ValueError("Unable to find device '/dev/root'") + return dev def resize_devices(resizer, devices): |