mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-15 17:06:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-apps/ignition: add networkd translate fix

Browse Source 
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
This commit is contained in:
Mathieu Tortuyaux 2022-07-27 10:38:10 +02:00
parent 0d2a3f29fb
commit 669a944e8d
3 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-mod-bump-ign-converter-to-pull-networkd-fix.patch vendored Normal file
View File

@ -0,0 +1,79 @@
From 9c0bfb9d652d7446e7d2af28e42622a9371708c6 Mon Sep 17 00:00:00 2001
From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
Date: Wed, 27 Jul 2022 10:35:37 +0200
Subject: [PATCH] mod: bump ign-converter to pull networkd fix
Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
---
go.mod | 2 +-
go.sum | 4 ++--
.../ign-converter/translate/v24tov31/v24tov31.go | 4 ++--
vendor/modules.txt | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/go.mod b/go.mod
index 9b5da9f3..3e201cfd 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-systemd/v22 v22.0.0
github.com/coreos/vcontext v0.0.0-20211021162308-f1dbbca7bef4
- github.com/flatcar-linux/ign-converter v0.2.0
+ github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0
github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba
github.com/google/renameio v0.1.0
github.com/google/uuid v1.1.1
diff --git a/go.sum b/go.sum
index afe8e529..82290ed3 100644
--- a/go.sum
+++ b/go.sum
@@ -70,8 +70,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/flatcar-linux/ign-converter v0.2.0 h1:XAIP2LHgqwtkPmJmilKSblCj0tGCO86qCrnbO6jgPM8=
-github.com/flatcar-linux/ign-converter v0.2.0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y=
+github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0 h1:7AIVpKuKQ2tUgczrGlR5A3vCqEizqmE2YFLhOnyZtIQ=
+github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0/go.mod h1:t/kcw0CQ/uKMCyZwDAzuwMO3CShxaimEJhQzLGCsb3Y=
github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba h1:HiTCL7737Hi944kXfLN8ReGoJtAiibGIsCk3MGlYy9M=
github.com/flatcar-linux/ignition v0.36.2-0.20220221101037-de4e6cc9bbba/go.mod h1:JzHCIdCu9dy0xtezyBit/aOY4QIlJ12UYU6nXNPnnRE=
github.com/flatcar-linux/ignition/v2 v2.2.1-0.20220302150437-ce14e51676e9/go.mod h1:n076OVuGbg6f+j3YYoxFCjRyMU2hxsx6Q4Gy0xwO7cM=
diff --git a/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go
index d10cd7c3..f940b421 100644
--- a/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go
+++ b/vendor/github.com/flatcar-linux/ign-converter/translate/v24tov31/v24tov31.go
@@ -534,7 +534,7 @@ func translateNetworkd(units []old.Networkdunit, m map[string]string) []types.Fi
file.Node.Path = filepath.Join(m["root"], "/etc/systemd/network", u.Name)
// URL encoding unit content to follow 'data' format - we could use base64 also.
- file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.QueryEscape(u.Contents))
+ file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.PathEscape(u.Contents))
ret = append(ret, file)
}
@@ -552,7 +552,7 @@ func translateNetworkd(units []old.Networkdunit, m map[string]string) []types.Fi
}
file.Node.Path = filepath.Join(m["root"], "/etc/systemd/network", string(u.Name)+".d", d.Name)
- file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.QueryEscape(d.Contents))
+ file.FileEmbedded1.Contents.Source = util.StrPStrict("data:," + url.PathEscape(d.Contents))
ret = append(ret, file)
}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 71ec1839..3e8983d0 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -84,7 +84,7 @@ github.com/coreos/vcontext/tree
github.com/coreos/vcontext/validate
# github.com/davecgh/go-spew v1.1.0
github.com/davecgh/go-spew/spew
-# github.com/flatcar-linux/ign-converter v0.2.0
+# github.com/flatcar-linux/ign-converter v0.2.1-0.20220727141303-4991326b64e0
## explicit
github.com/flatcar-linux/ign-converter/translate/v24tov31
github.com/flatcar-linux/ign-converter/util
--
2.35.1

0
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.14.0-r2.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.14.0-r3.ebuild vendored
View File

1
sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild vendored
View File

@ -57,6 +57,7 @@ PATCHES=(
"${FILESDIR}/0013-Revert-drop-OEM-URI-support.patch"
"${FILESDIR}/0014-internal-resource-url-support-btrfs-as-OEM-partition.patch"
"${FILESDIR}/0015-internal-exec-stages-disks-prevent-races-with-udev.patch"
"${FILESDIR}/0016-mod-bump-ign-converter-to-pull-networkd-fix.patch"
)
src_compile() {