third_party/go/gvisor: fix syslog integration
Change-Id: I985517e5b2585a2f29ffd352f38b26c0ab5c8f4a
Reviewed-on: https://review.monogon.dev/c/monogon/+/1385
Reviewed-by: Leopold Schabel <leo@monogon.tech>
Tested-by: Jenkins CI
diff --git a/third_party/go/patches/gvisor-fix-syslog.patch b/third_party/go/patches/gvisor-fix-syslog.patch
new file mode 100644
index 0000000..99f23d9
--- /dev/null
+++ b/third_party/go/patches/gvisor-fix-syslog.patch
@@ -0,0 +1,24 @@
+diff -ur dev_gvisor_gvisor.orig/pkg/sentry/kernel/syslog.go dev_gvisor_gvisor/pkg/sentry/kernel/syslog.go
+--- dev_gvisor_gvisor.orig/pkg/sentry/kernel/syslog.go 2023-03-22 18:31:40.976045180 +0100
++++ dev_gvisor_gvisor/pkg/sentry/kernel/syslog.go 2023-03-22 18:40:18.143912568 +0100
+@@ -81,6 +81,11 @@
+ "Recruiting cron-ies...",
+ "Verifying that no non-zero bytes made their way into /dev/zero...",
+ "Accelerating teletypewriter to 9600 baud...",
++ "Supervising the supervisor...",
++ "Adding more KubernetesWorker nodes...",
++ "Picking a new name for Metropolis...",
++ "Re-reading the TPM spec...",
++ "Re-implementing mkfs.xfs in Go...",
+ }
+
+ selectMessage := func() string {
+@@ -96,7 +101,7 @@
+
+ const format = "<6>[%11.6f] %s\n"
+
+- s.msg = append(s.msg, []byte(fmt.Sprintf(format, 0.0, "Starting gVisor..."))...)
++ s.msg = append(s.msg, []byte(fmt.Sprintf(format, 0.0, "Starting gVisor on Metropolis..."))...)
+
+ time := 0.1
+ for i := 0; i < 10; i++ {
diff --git a/third_party/go/repositories.bzl b/third_party/go/repositories.bzl
index 8da736a..5970b14 100644
--- a/third_party/go/repositories.bzl
+++ b/third_party/go/repositories.bzl
@@ -5238,7 +5238,7 @@
patches = [
"//third_party/go/patches:gvisor-containerd-compat.patch",
"//third_party/go/patches:gvisor-fix-resolution.patch",
- #"//third_party/go/patches:gvisor-build-against-newer-runtime-specs.patch",
+ "//third_party/go/patches:gvisor-fix-syslog.patch",
],
sum = "h1:aXIFpjZYl3zv2rQyr4rSit5Uq0k7BVXC8lJaDa4Cg7M=",
version = "v0.0.0-20220315202956-f1399ecf1672",