github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-29 14:30:52 +00:00
Code Issues Projects Releases Wiki Activity

agent/rustjail/mount: don't use unwrap

Browse Source 
Don't use unwrap in `init_rootfs` instead return an Error, this way
we can write unit tests that don't panic.

Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
Julio Montes 2020-09-09 10:46:32 -05:00 committed by Eric Ernst
parent fa7079bc41
commit 77ecfed24e
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/agent/rustjail/src/mount.rs
View File

@ -138,16 +138,28 @@ pub fn init_rootfs(
lazy_static::initialize(&PROPAGATION); lazy_static::initialize(&PROPAGATION);
lazy_static::initialize(&LINUXDEVICETYPE); lazy_static::initialize(&LINUXDEVICETYPE);
let linux = spec.linux.as_ref().unwrap(); let linux = &spec
.linux
.as_ref()
.ok_or::<Error>(anyhow!("Could not get linux configuration from spec"))?;
let mut flags = MsFlags::MS_REC; let mut flags = MsFlags::MS_REC;
match PROPAGATION.get(&linux.rootfs_propagation.as_str()) { match PROPAGATION.get(&linux.rootfs_propagation.as_str()) {
Some(fl) => flags |= *fl, Some(fl) => flags |= *fl,
None => flags |= MsFlags::MS_SLAVE, None => flags |= MsFlags::MS_SLAVE,
} }
let rootfs = spec.root.as_ref().unwrap().path.as_str(); let root = spec
let root = fs::canonicalize(rootfs)?; .root
let rootfs = root.to_str().unwrap(); .as_ref()
.ok_or(anyhow!("Could not get rootfs path from spec"))
.and_then(|r| {
fs::canonicalize(r.path.as_str()).context("Could not canonicalize rootfs path")
})?;
let rootfs = (*root)
.to_str()
.ok_or(anyhow!("Could not convert rootfs path to string"))?;
mount(None::<&str>, "/", None::<&str>, flags, None::<&str>)?; mount(None::<&str>, "/", None::<&str>, flags, None::<&str>)?;