Add support for new Docker init process /sbin/docker-init

FooBarWidget · Sep 12, 2019 · 08d8017 · 08d8017
1 parent 61fe50d
commit 08d8017
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "activatecontaineruid"
-version = "0.9.1"
+version = "0.9.2"
 authors = ["Hongli Lai <[email protected]>"]
 edition = "2018"
 

diff --git a/src/main.rs b/src/main.rs
@@ -37,7 +37,8 @@ fn check_running_allowed() {
                  of the following conditions apply:\n\
                  \n \
                  - This program is run as PID 1.\n \
-                 - This program is a child of PID 1, and PID 1 is the Docker init process /dev/init.\n \
+                 - This program is a child of PID 1, and PID 1 is the Docker \
+                 init process (/dev/init, /sbin/docker-init).\n \
                  - This program is run with root privileges (but not \
                  via the setuid root bit)."
             );
@@ -105,7 +106,7 @@ fn is_child_of_pid1_docker_init() -> bool {
     match result {
         Ok(output) => {
             if output.status.success() {
-                output.stdout == b"/dev/init\n"
+                output.stdout == b"/dev/init\n" || output.stdout == b"/sbin/docker-init\n"
             } else {
                 warn!(
                     "Error determining whether PID 1 is the Docker init process \