summaryrefslogtreecommitdiffstats
path: root/debian/patches/0006-skip-userns-test-in-schroot-as-well.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches/0006-skip-userns-test-in-schroot-as-well.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/debian/patches/0006-skip-userns-test-in-schroot-as-well.patch b/debian/patches/0006-skip-userns-test-in-schroot-as-well.patch
new file mode 100644
index 0000000..c4a061f
--- /dev/null
+++ b/debian/patches/0006-skip-userns-test-in-schroot-as-well.patch
@@ -0,0 +1,35 @@
+From: Shengjing Zhu <zhsj@debian.org>
+Date: Fri, 5 Feb 2021 21:21:45 +0800
+Subject: skip userns test in schroot as well
+
+When schroot is using overlayfs, it fails to detect it as chroot.
+
+---
+ src/syscall/exec_linux_test.go | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/syscall/exec_linux_test.go b/src/syscall/exec_linux_test.go
+index b79dee7..9f3d651 100644
+--- a/src/syscall/exec_linux_test.go
++++ b/src/syscall/exec_linux_test.go
+@@ -33,6 +33,10 @@ func isLXC() bool {
+ return os.Getenv("container") == "lxc"
+ }
+
++func isSchroot() bool {
++ return os.Getenv("SCHROOT_SESSION_ID") != ""
++}
++
+ func skipInContainer(t *testing.T) {
+ // TODO: the callers of this func are using this func to skip
+ // tests when running as some sort of "fake root" that's uid 0
+@@ -48,6 +52,9 @@ func skipInContainer(t *testing.T) {
+ if isLXC() {
+ t.Skip("skip this test in LXC container")
+ }
++ if isSchroot() {
++ t.Skip("skip this test in Schroot container")
++ }
+ }
+
+ func skipNoUserNamespaces(t *testing.T) {