Skip run_user overlay when runtime dir is unknown
This commit is contained in:
@@ -41,7 +41,9 @@ pub fn resolve_overlays(ctx: &PathContext) -> Result<BlacklistOverlays, SandboxE
|
|||||||
pub fn resolve_path_context() -> Result<PathContext, SandboxError> {
|
pub fn resolve_path_context() -> Result<PathContext, SandboxError> {
|
||||||
let home = std::env::var("HOME").map_err(|_| SandboxError::HomeNotSet)?;
|
let home = std::env::var("HOME").map_err(|_| SandboxError::HomeNotSet)?;
|
||||||
let run_user = std::env::var("XDG_RUNTIME_DIR")
|
let run_user = std::env::var("XDG_RUNTIME_DIR")
|
||||||
.unwrap_or_else(|_| resolve_run_user_from_proc().unwrap_or_else(|| "/run/user/0".into()));
|
.ok()
|
||||||
|
.or_else(resolve_run_user_from_proc)
|
||||||
|
.unwrap_or_default();
|
||||||
Ok(PathContext { home, run_user })
|
Ok(PathContext { home, run_user })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user