diff options
author | Scott Moser <smoser@ubuntu.com> | 2016-04-15 13:54:05 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2016-04-15 13:54:05 -0400 |
commit | 53931ee132f0d236e3ed1b7fd6e0e0b519f40bda (patch) | |
tree | 7322e5b0a164774170e8b1d60eae8d07c99efd8f /bin | |
parent | 79b59658dfdc0172818c54e3c7149e6ed914a93b (diff) | |
download | vyos-cloud-init-53931ee132f0d236e3ed1b7fd6e0e0b519f40bda.tar.gz vyos-cloud-init-53931ee132f0d236e3ed1b7fd6e0e0b519f40bda.zip |
log that you're not applying config
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/cloud-init | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/cloud-init b/bin/cloud-init index b449ac95..5857af32 100755 --- a/bin/cloud-init +++ b/bin/cloud-init @@ -265,10 +265,13 @@ def main_init(name, args): else: return (None, ["No instance datasource found."]) - if args.local and not init.ds_restored: - # if local mode and the datasource was not restored from cache - # (this is not first boot) then apply networking. - init.apply_network_config() + if args.local: + if not init.ds_restored: + # if local mode and the datasource was not restored from cache + # (this is not first boot) then apply networking. + init.apply_network_config() + else: + LOG.debug("skipping networking config from restored datasource.") # Stage 6 iid = init.instancify() |