Skip to content

Commit 3565b8e

Browse files
committed
overlay afterburn: adjust Flatcar patch for 5.10
Adjust Flatcar patch for afterburn 5.10. Signed-off-by: Dongsu Park <[email protected]>
1 parent 1a40dd5 commit 3565b8e

File tree

1 file changed

+13
-21
lines changed

1 file changed

+13
-21
lines changed

sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/0001-Revert-remove-cl-legacy-feature.patch

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ index a4b7224..c2e3cc9 100644
3838

3939
+[[package]]
4040
+name = "hostname"
41-
+version = "0.4.0"
41+
+version = "0.4.1"
4242
+source = "registry+https://github.com/rust-lang/crates.io-index"
43-
+checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba"
43+
+checksum = "a56f203cd1c76362b69e3863fd987520ac36cf70a8c92627449b2f64a8cf7d65"
4444
+dependencies = [
4545
+ "cfg-if",
4646
+ "libc",
@@ -49,33 +49,24 @@ index a4b7224..c2e3cc9 100644
4949
+
5050
[[package]]
5151
name = "http"
52-
version = "1.1.0"
53-
@@ -2478,6 +2490,25 @@ version = "0.4.0"
52+
version = "1.3.1"
53+
@@ -2478,6 +2490,16 @@ version = "0.4.0"
5454
source = "registry+https://github.com/rust-lang/crates.io-index"
55-
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
55+
checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
5656

5757
+[[package]]
5858
+name = "windows"
59-
+version = "0.52.0"
59+
+version = "0.62.0"
6060
+source = "registry+https://github.com/rust-lang/crates.io-index"
61-
+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
61+
+checksum = "9579d0e6970fd5250aa29aba5994052385ff55cf7b28a059e484bb79ea842e42"
6262
+dependencies = [
6363
+ "windows-core",
6464
+ "windows-targets 0.52.6",
6565
+]
66-
+
67-
+[[package]]
68-
+name = "windows-core"
69-
+version = "0.52.0"
70-
+source = "registry+https://github.com/rust-lang/crates.io-index"
71-
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
72-
+dependencies = [
73-
+ "windows-targets 0.52.6",
74-
+]
7566
+
7667
[[package]]
7768
name = "windows-registry"
78-
version = "0.2.0"
69+
version = "0.5.3"
7970
diff --git a/Cargo.toml b/Cargo.toml
8071
index 0929be8..7cd4b91 100644
8172
--- a/Cargo.toml
@@ -102,13 +93,13 @@ index 94f9238..2ad1c8e 100644
10293
+++ b/src/metadata.rs
10394
@@ -35,6 +35,8 @@ use crate::providers::packet::PacketProvider;
10495
use crate::providers::powervs::PowerVSProvider;
105-
use crate::providers::proxmoxve::ProxmoxVEConfigDrive;
96+
use crate::providers::proxmoxve;
10697
use crate::providers::scaleway::ScalewayProvider;
10798
+#[cfg(feature = "cl-legacy")]
10899
+use crate::providers::vagrant_virtualbox::VagrantVirtualboxProvider;
100+
use crate::providers::upcloud::UpCloudProvider;
109101
use crate::providers::vmware::VmwareProvider;
110102
use crate::providers::vultr::VultrProvider;
111-
112103
@@ -60,6 +62,10 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi
113104
"cloudstack-configdrive" => box_result!(ConfigDrive::try_new()?),
114105
"digitalocean" => box_result!(DigitalOceanProvider::try_new()?),
@@ -122,13 +113,13 @@ index 94f9238..2ad1c8e 100644
122113
// IBM Cloud - VPC Generation 2.
123114
@@ -73,6 +79,8 @@ pub fn fetch_metadata(provider: &str) -> Result<Box<dyn providers::MetadataProvi
124115
"powervs" => box_result!(PowerVSProvider::try_new()?),
125-
"proxmoxve" => box_result!(ProxmoxVEConfigDrive::try_new()?),
116+
"proxmoxve" => proxmoxve::try_config_drive_else_leave(),
126117
"scaleway" => box_result!(ScalewayProvider::try_new()?),
127118
+ #[cfg(feature = "cl-legacy")]
128119
+ "vagrant-virtualbox" => box_result!(VagrantVirtualboxProvider::new()),
120+
"upcloud" => box_result!(UpCloudProvider::try_new()?),
129121
"vmware" => box_result!(VmwareProvider::try_new()?),
130122
"vultr" => box_result!(VultrProvider::try_new()?),
131-
_ => bail!("unknown provider '{}'", provider),
132123
diff --git a/src/providers/mod.rs b/src/providers/mod.rs
133124
index e17d551..6fe44b6 100644
134125
--- a/src/providers/mod.rs
@@ -139,6 +130,7 @@ index e17d551..6fe44b6 100644
139130
pub mod scaleway;
140131
+#[cfg(feature = "cl-legacy")]
141132
+pub mod vagrant_virtualbox;
133+
pub mod upcloud;
142134
pub mod vmware;
143135
pub mod vultr;
144136

0 commit comments

Comments
 (0)