diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-10-03 07:45:02 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-10-03 07:45:02 -0400 |
| commit | 8c8bee9afd2e3a03498f868e8a4159af157c055f (patch) | |
| tree | e90a28b7ec9f2dbcb9267e02e1f6aec1176354e0 /cloudinit | |
| parent | ea88f3e1208ba501b50d1f41187b83cf11f15785 (diff) | |
| parent | 26d2c9a3b4b9fdcdd0d26b62df2aad68ee480f62 (diff) | |
| download | vyos-cloud-init-8c8bee9afd2e3a03498f868e8a4159af157c055f.tar.gz vyos-cloud-init-8c8bee9afd2e3a03498f868e8a4159af157c055f.zip | |
merge from trunk
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/config/cc_growpart.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py index 2d54aabf..0dd92a46 100644 --- a/cloudinit/config/cc_growpart.py +++ b/cloudinit/config/cc_growpart.py @@ -32,6 +32,7 @@ frequency = PER_ALWAYS DEFAULT_CONFIG = { 'mode': 'auto', 'devices': ['/'], + 'ignore_growroot_disabled': False, } @@ -251,6 +252,12 @@ def handle(_name, cfg, _cloud, log, _args): log.debug("growpart disabled: mode=%s" % mode) return + if util.is_false(mycfg.get('ignore_growroot_disabled', False)): + if os.path.isfile("/etc/growroot-disabled"): + log.debug("growpart disabled: /etc/growroot-disabled exists") + log.debug("use ignore_growroot_disabled to ignore") + return + devices = util.get_cfg_option_list(cfg, "devices", ["/"]) if not len(devices): log.debug("growpart: empty device list") |