diff --git a/1001-cloud-setup-IMDSv2-rh2151987.patch b/1001-cloud-setup-IMDSv2-rh2151987.patch index 4e27ca0..4da0012 100644 --- a/1001-cloud-setup-IMDSv2-rh2151987.patch +++ b/1001-cloud-setup-IMDSv2-rh2151987.patch @@ -9,6 +9,7 @@ pack it together in one memory allocation. (cherry picked from commit 599fe234ea4864396eb70530513b2646aa97f576) (cherry picked from commit 3787eacac9c1fc9ff9b423f9d9cea9907e209ebb) +(cherry picked from commit 89a6ce575d52bbaa1b928275c39517a071449da7) --- src/nm-cloud-setup/nm-http-client.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) @@ -45,6 +46,7 @@ index a0964e2165..98ede1e403 100644 -- 2.39.2 + From 36d417af60a2a09863e00cae869899883265ee8c Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 27 Feb 2023 00:09:13 +0100 @@ -54,6 +56,7 @@ It's not used anywhere. (cherry picked from commit ce225b2c06089adc402277f2b80afacb9da8cc5f) (cherry picked from commit 23b9514080c0c578ec5a8e023081837240f41896) +(cherry picked from commit 36d417af60a2a09863e00cae869899883265ee8c) --- src/nm-cloud-setup/nm-http-client.c | 4 ++-- src/nm-cloud-setup/nm-http-client.h | 15 --------------- @@ -110,6 +113,7 @@ index 0a7052ae25..6cc08ba97c 100644 -- 2.39.2 + From 20cd11ee4974bb1690d523d5700492ad9c618688 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 27 Feb 2023 00:09:40 +0100 @@ -120,6 +124,7 @@ Also, "request" would've been too long, "req" looks nicer. (cherry picked from commit 85ce088616aae3d61c9bc51eb395d1f59ed9a503) (cherry picked from commit 6e8cfbae32e22ba75693146039b53b516a4147e1) +(cherry picked from commit 20cd11ee4974bb1690d523d5700492ad9c618688) --- src/nm-cloud-setup/nm-http-client.c | 142 +++++++++++----------- src/nm-cloud-setup/nm-http-client.h | 8 +- @@ -888,6 +893,7 @@ index a325f31a17..571c0fb826 100644 -- 2.39.2 + From aaf66e9174eb04d2df1f45530ebdca16e77a6ec5 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 27 Feb 2023 00:13:31 +0100 @@ -898,6 +904,7 @@ We'll need to be able to issue PUT calls. (cherry picked from commit cd74d75002783a79d1a4fca24b2fbe99ced933a8) (cherry picked from commit eff4372045290ad380bddf03e5075ab671a7cff6) +(cherry picked from commit aaf66e9174eb04d2df1f45530ebdca16e77a6ec5) --- src/nm-cloud-setup/nm-http-client.c | 7 +++++++ src/nm-cloud-setup/nm-http-client.h | 1 + @@ -1168,6 +1175,7 @@ index 571c0fb826..ca354865dd 100644 -- 2.39.2 + From 06fc0ef35dc7e5e6295ab9beecba6071e556d55e Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 7 Mar 2023 13:51:57 +0100 @@ -1180,6 +1188,7 @@ we're going to rely on that. (cherry picked from commit 088bfd817ab5eb8aa0fb9cffe52fa3f456030ecc) (cherry picked from commit d99864ccba6d7c9bac66dcbbcc49c01be0ddd719) +(cherry picked from commit 06fc0ef35dc7e5e6295ab9beecba6071e556d55e) --- src/nm-cloud-setup/nmcs-provider.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) @@ -1228,6 +1237,7 @@ index 502f1d0323..3662fbe391 100644 -- 2.39.2 + From e3ac982b32361105708d489a73eaed2bc4dc5f9f Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 27 Feb 2023 00:15:11 +0100 @@ -1246,6 +1256,7 @@ be used to detect the AWS EC2 cloud. https://bugzilla.redhat.com/show_bug.cgi?id=2151986 (cherry picked from commit 8b7e12c2d631c47292258c29429cd565715ea186) (cherry picked from commit 429f36cd81ddbe337f04c09a352fd78cd29e394d) +(cherry picked from commit e3ac982b32361105708d489a73eaed2bc4dc5f9f) --- src/nm-cloud-setup/nmcs-provider-ec2.c | 74 +++++++++++++++++++------- 1 file changed, 54 insertions(+), 20 deletions(-)