diff options
| author | Gonéri Le Bouder <goneri@lebouder.net> | 2020-04-24 12:06:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-24 11:06:59 -0500 |
| commit | e4499963d663b52ca4b66423c0445909d710cfbd (patch) | |
| tree | fcff72147bfaee9d10a4287cefe94c64a41259ae /cloudinit/sources | |
| parent | 38a7e6e9756fdab31264c0d6e93d20432ed111ac (diff) | |
| download | vyos-cloud-init-e4499963d663b52ca4b66423c0445909d710cfbd.tar.gz vyos-cloud-init-e4499963d663b52ca4b66423c0445909d710cfbd.zip | |
nocloud: drop work around for Linux 2.6 (#324)
These two lines were a requirement for RHEL6, and they have been added 7
years ago:
- https://github.com/canonical/cloud-init/commit/984c72e522c585c6d3f6b3d3aec39fb21dd84028
- https://github.com/canonical/cloud-init/commit/48a3b4ca0ba55699825d6eabe75d843286c23545
RHEL6 comes with Python 2.6, since Python3 is now a strong requirement, I
think it's safe to remove.
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceNoCloud.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py index 2a44128d..71d5fc2e 100644 --- a/cloudinit/sources/DataSourceNoCloud.py +++ b/cloudinit/sources/DataSourceNoCloud.py @@ -49,10 +49,6 @@ class DataSourceNoCloud(sources.DataSource): devlist.append('/dev/' + dev) devlist.append('/dev/' + dev + 'a') # NetBSD 7 else: - # Query optical drive to get it in blkid cache for 2.6 kernels - util.find_devs_with(path="/dev/sr0") - util.find_devs_with(path="/dev/sr1") - fslist = util.find_devs_with("TYPE=vfat") fslist.extend(util.find_devs_with("TYPE=iso9660")) |