diff options
author | Dmitry Torokhov <dtor@chromium.org> | 2019-08-15 15:27:25 -0700 |
---|---|---|
committer | Dmitry Torokhov <dtor@chromium.org> | 2019-08-19 00:38:00 +0000 |
commit | 47becf5b048df52aa2a2899e4ab7044a9ba18356 (patch) | |
tree | 119aa7f6563edab1ca8abdc4ce3d1999a0982579 /src/plugin/mod.rs | |
parent | 3c8f32dfb00b2abe9f7434f526a86449d4a9b3e0 (diff) | |
download | crosvm-47becf5b048df52aa2a2899e4ab7044a9ba18356.tar crosvm-47becf5b048df52aa2a2899e4ab7044a9ba18356.tar.gz crosvm-47becf5b048df52aa2a2899e4ab7044a9ba18356.tar.bz2 crosvm-47becf5b048df52aa2a2899e4ab7044a9ba18356.tar.lz crosvm-47becf5b048df52aa2a2899e4ab7044a9ba18356.tar.xz crosvm-47becf5b048df52aa2a2899e4ab7044a9ba18356.tar.zst crosvm-47becf5b048df52aa2a2899e4ab7044a9ba18356.zip |
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>
Diffstat (limited to 'src/plugin/mod.rs')
-rw-r--r-- | src/plugin/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
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() { |