diff options
| author | zsdc <taras@vyos.io> | 2020-09-15 17:05:20 +0300 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2020-09-15 17:05:20 +0300 |
| commit | 7cd260b313267dc7123cb99a75d4555e24909cca (patch) | |
| tree | f57f3db085a724df237ffa64b589c6bb6dd3b28f /cloudinit/stages.py | |
| parent | 1a790ee102fd405e5c3a20a17a69ba0c118ed874 (diff) | |
| parent | 948bd9c1fcd08346cf8ec0551d7f6c2b234e896b (diff) | |
| download | vyos-cloud-init-7cd260b313267dc7123cb99a75d4555e24909cca.tar.gz vyos-cloud-init-7cd260b313267dc7123cb99a75d4555e24909cca.zip | |
T2117: Cloud-init updated to 20.3
Merged with 20.3 tag from the upstream Cloud-init repository
Diffstat (limited to 'cloudinit/stages.py')
| -rw-r--r-- | cloudinit/stages.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cloudinit/stages.py b/cloudinit/stages.py index db8ba64c..765f4aab 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -696,7 +696,7 @@ class Init(object): netcfg, src = self._find_networking_config() # ensure all physical devices in config are present - net.wait_for_physdevs(netcfg) + self.distro.networking.wait_for_physdevs(netcfg) # apply renames from config self._apply_netcfg_names(netcfg) @@ -947,7 +947,6 @@ def _pkl_load(fname): except Exception as e: if os.path.isfile(fname): LOG.warning("failed loading pickle in %s: %s", fname, e) - pass # This is allowed so just return nothing successfully loaded... if not pickle_contents: |