diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/0001-Revert-remove-cl-legacy-feature.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/0001-Revert-remove-cl-legacy-feature.patch index a8527e8430..8b6f63c57d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/0001-Revert-remove-cl-legacy-feature.patch +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/0001-Revert-remove-cl-legacy-feature.patch @@ -38,9 +38,9 @@ index a4b7224..c2e3cc9 100644 +[[package]] +name = "hostname" -+version = "0.4.0" ++version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" ++checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65" +dependencies = [ + "cfg-if", + "libc", @@ -49,33 +49,24 @@ index a4b7224..c2e3cc9 100644 + [[package]] name = "http" - version = "1.1.0" -@@ -2478,6 +2490,25 @@ version = "0.4.0" + version = "1.3.1" +@@ -2478,6 +2490,16 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" +[[package]] +name = "windows" -+version = "0.52.0" ++version = "0.62.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" ++checksum = "9579d0e6970fd5250aa29aba5994052385ff55cf7b28a059e484bb79ea842e42" +dependencies = [ + "windows-core", + "windows-targets 0.52.6", +] -+ -+[[package]] -+name = "windows-core" -+version = "0.52.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -+dependencies = [ -+ "windows-targets 0.52.6", -+] + [[package]] name = "windows-registry" - version = "0.2.0" + version = "0.5.3" diff --git a/Cargo.toml b/Cargo.toml index 0929be8..7cd4b91 100644 --- a/Cargo.toml @@ -102,13 +93,13 @@ index 94f9238..2ad1c8e 100644 +++ b/src/metadata.rs @@ -35,6 +35,8 @@ use crate::providers::packet::PacketProvider; use crate::providers::powervs::PowerVSProvider; - use crate::providers::proxmoxve::ProxmoxVEConfigDrive; + use crate::providers::proxmoxve; use crate::providers::scaleway::ScalewayProvider; +#[cfg(feature = "cl-legacy")] +use crate::providers::vagrant_virtualbox::VagrantVirtualboxProvider; + use crate::providers::upcloud::UpCloudProvider; use crate::providers::vmware::VmwareProvider; use crate::providers::vultr::VultrProvider; - @@ -60,6 +62,10 @@ pub fn fetch_metadata(provider: &str) -> Result box_result!(ConfigDrive::try_new()?), "digitalocean" => box_result!(DigitalOceanProvider::try_new()?), @@ -122,13 +113,13 @@ index 94f9238..2ad1c8e 100644 // IBM Cloud - VPC Generation 2. @@ -73,6 +79,8 @@ pub fn fetch_metadata(provider: &str) -> Result box_result!(PowerVSProvider::try_new()?), - "proxmoxve" => box_result!(ProxmoxVEConfigDrive::try_new()?), + "proxmoxve" => proxmoxve::try_config_drive_else_leave(), "scaleway" => box_result!(ScalewayProvider::try_new()?), + #[cfg(feature = "cl-legacy")] + "vagrant-virtualbox" => box_result!(VagrantVirtualboxProvider::new()), + "upcloud" => box_result!(UpCloudProvider::try_new()?), "vmware" => box_result!(VmwareProvider::try_new()?), "vultr" => box_result!(VultrProvider::try_new()?), - _ => bail!("unknown provider '{}'", provider), diff --git a/src/providers/mod.rs b/src/providers/mod.rs index e17d551..6fe44b6 100644 --- a/src/providers/mod.rs @@ -139,6 +130,7 @@ index e17d551..6fe44b6 100644 pub mod scaleway; +#[cfg(feature = "cl-legacy")] +pub mod vagrant_virtualbox; + pub mod upcloud; pub mod vmware; pub mod vultr;