commit a44166128714945d093c30d241f89b96a6e44e75
author Benjamin Peterson <bp@benjamin.pe> Wed Mar 04 22:40:20 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Mar 04 22:41:34 2020 -0800
tree 08438e5455fb60d73f3176a1a73699665fb93994
parent e088bd013e590b7381e4298460b4222e41ab3d7b

linux-sandbox: Print a debug message when a remount failure is ignored.

Closes #10375.

PiperOrigin-RevId: 299024675

src/main/tools/linux-sandbox-pid1.cc

diff --git a/src/main/tools/linux-sandbox-pid1.cc b/src/main/tools/linux-sandbox-pid1.cc
index f02dcba..6514654 100644
--- a/src/main/tools/linux-sandbox-pid1.cc
+++ b/src/main/tools/linux-sandbox-pid1.cc
@@ -40,6 +40,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
+
 #include <string>
 
 #ifndef MS_REC
@@ -181,8 +182,8 @@
   }
 
   for (size_t i = 0; i < opt.bind_mount_sources.size(); i++) {
-    const std::string& source = opt.bind_mount_sources.at(i);
-    const std::string& target = opt.bind_mount_targets.at(i);
+    const std::string &source = opt.bind_mount_sources.at(i);
+    const std::string &target = opt.bind_mount_targets.at(i);
     PRINT_DEBUG("bind mount: %s -> %s", source.c_str(), target.c_str());
     if (mount(source.c_str(), target.c_str(), nullptr, MS_BIND, nullptr) < 0) {
       DIE("mount(%s, %s, nullptr, MS_BIND, nullptr)", source.c_str(),
@@ -275,10 +276,19 @@
       // mount is a broken NFS mount. In the ideal case, the user would either
       // fix or remove that mount, but in cases where that's not possible, we
       // should just ignore it.
-      if (errno != EACCES && errno != EPERM && errno != EINVAL &&
-          errno != ENOENT && errno != ESTALE) {
-        DIE("remount(nullptr, %s, nullptr, %d, nullptr)", ent->mnt_dir,
-            mountFlags);
+      switch (errno) {
+        case EACCES:
+        case EPERM:
+        case EINVAL:
+        case ENOENT:
+        case ESTALE:
+          PRINT_DEBUG(
+              "remount(nullptr, %s, nullptr, %d, nullptr) failure (%m) ignored",
+              ent->mnt_dir, mountFlags);
+          break;
+        default:
+          DIE("remount(nullptr, %s, nullptr, %d, nullptr)", ent->mnt_dir,
+              mountFlags);
       }
     }
   }