Browse code

Update runc to introduce RelabelNeeded function

Signed-off-by: Alexander Morozov <lk4d4@docker.com>

Alexander Morozov authored on 2015/11/10 03:01:48
Showing 3 changed files
... ...
@@ -48,7 +48,9 @@ clone git github.com/endophage/gotuf 2df1c8e0a7b7e10ae2113bf37aaa1bf1c1de8cc5
48 48
 clone git github.com/jfrazelle/go v1.5.1-1
49 49
 clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
50 50
 
51
-clone git github.com/opencontainers/runc 6c198ae2d065c37f44316e0de3df7f3b88950923 # libcontainer
51
+# this runc commit from branch relabel_fix_docker_1.9.1, pls remove it when you
52
+# update next time
53
+clone git github.com/opencontainers/runc 1349b37bd56f4f5ce2690b5b2c0f53f88a261c67 # libcontainer
52 54
 # libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
53 55
 clone git github.com/coreos/go-systemd v3
54 56
 clone git github.com/godbus/dbus v2
... ...
@@ -65,6 +65,11 @@ func Validate(label string) error {
65 65
 	return nil
66 66
 }
67 67
 
68
+// RelabelNeeded checks whether the user requested a relabel
69
+func RelabelNeeded(label string) bool {
70
+	return false
71
+}
72
+
68 73
 // IsShared checks that the label includes a "shared" mark
69 74
 func IsShared(label string) bool {
70 75
 	return false
... ...
@@ -181,6 +181,11 @@ func Validate(label string) error {
181 181
 	return nil
182 182
 }
183 183
 
184
+// RelabelNeeded checks whether the user requested a relabel
185
+func RelabelNeeded(label string) bool {
186
+	return strings.Contains(label, "z") || strings.Contains(label, "Z")
187
+}
188
+
184 189
 // IsShared checks that the label includes a "shared" mark
185 190
 func IsShared(label string) bool {
186 191
 	return strings.Contains(label, "z")