linux: use run.oci instead of io.crun

oci.run is reserved for crun. Signed-off-by: Giuseppe Scrivano <[email protected]>
containers · Dec 9, 2019 · 6df9308 · 6df9308
1 parent 56f5e31
commit 6df9308
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/crun.1.md b/crun.1.md
@@ -288,9 +288,9 @@ Path to the file containing the resources to update.
 
 # Extensions to OCI
 
-## io.crun.keep_original_groups=1
+## run.oci.keep_original_groups=1
 
-If the annotation `io.crun.keep_original_groups` is present, then crun
+If the annotation `run.oci.keep_original_groups` is present, then crun
 will skip the `setgroups` syscall that is used to either set the
 additional groups specified in the OCI configuration, or to reset the
 list of additional groups if none is specified.

diff --git a/src/libcrun/linux.c b/src/libcrun/linux.c
@@ -1408,7 +1408,7 @@ can_setgroups (libcrun_container_t *container, libcrun_error_t *err)
       const char *annotation;
 
       /* Skip setgroups if the annotation is set to anything different than "0".  */
-      annotation = find_annotation (container, "io.crun.keep_original_groups");
+      annotation = find_annotation (container, "run.oci.keep_original_groups");
       if (annotation)
         return strcmp (annotation, "0") == 0 ? 1 : 0;
     }