From 47becf5b048df52aa2a2899e4ab7044a9ba18356 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor@chromium.org>
Date: Thu, 15 Aug 2019 15:27:25 -0700
Subject: plugin: switch to using /mnt/empty for root

We have stopped mounting /var/empty as we have decided that /mnt/empty
should be used instead.

BUG=chromium:933582,b:139436326
TEST=Start plugin VM.

Change-Id: I50bbf9d4a9ebd86d54cb9ecc67891921f46e27e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1757343
Tested-by: Dmitry Torokhov <dtor@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Auto-Submit: Dmitry Torokhov <dtor@chromium.org>
---
 src/plugin/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/plugin/mod.rs')

diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs
index 2680684..3453f38 100644
--- a/src/plugin/mod.rs
+++ b/src/plugin/mod.rs
@@ -525,7 +525,7 @@ pub fn run_config(cfg: Config) -> Result<()> {
         // An empty directory for jailed plugin pivot root.
         let root_path = match &cfg.plugin_root {
             Some(dir) => dir,
-            None => Path::new("/var/empty"),
+            None => Path::new(option_env!("DEFAULT_PIVOT_ROOT").unwrap_or("/var/empty")),
         };
 
         if root_path.is_relative() {
-- 
cgit 1.4.1