diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:42 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:42 -0400 |
| commit | e34dfab9fa310324f835ff4fbb2cf0a414b4d65e (patch) | |
| tree | f166c7dfc532514c57dfae4daaab691687f8f100 /bin | |
| parent | 06fc05ea20bf42e2fe29d3c9810994e1f7158564 (diff) | |
| parent | b029dcefe1ed33be8ed80f2e376ca6874dfd64f7 (diff) | |
| download | vyos-cloud-init-e34dfab9fa310324f835ff4fbb2cf0a414b4d65e.tar.gz vyos-cloud-init-e34dfab9fa310324f835ff4fbb2cf0a414b4d65e.zip | |
merge trunk at 0.7.7~bzr1212
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/cloud-init | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/cloud-init b/bin/cloud-init index 715be4b5..5857af32 100755 --- a/bin/cloud-init +++ b/bin/cloud-init @@ -266,7 +266,12 @@ def main_init(name, args): return (None, ["No instance datasource found."]) if args.local: - init.apply_network_config() + 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() |