mirror/youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-11-23 09:21:57 +01:00
Code Issues

Merge pull request #2438 from YJDoc2/fix/duplicate-device-mounts

Browse Source 
Fix device duplication in rootfs preparation
This commit is contained in:
Toru Komatsu 2023-10-15 15:22:10 +09:00 committed by GitHub
commit 1854870d47
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/libcontainer/src/rootfs/rootfs.rs
View File

@ -11,7 +11,7 @@ use crate::{
};
use nix::mount::MsFlags;
use oci_spec::runtime::{Linux, Spec};
use std::path::Path;
use std::{collections::HashSet, path::Path};
/// Holds information about rootfs
pub struct RootFS {
@ -99,11 +99,13 @@ impl RootFS {
let devicer = Device::new();
if let Some(added_devices) = linux.devices() {
devicer.create_devices(
rootfs,
default_devices().iter().chain(added_devices),
bind_devices,
)
let mut path_set = HashSet::new();
let devices = default_devices();
added_devices.iter().for_each(|d| {
path_set.insert(d.path());
});
let default = devices.iter().filter(|d| !path_set.contains(d.path()));
devicer.create_devices(rootfs, added_devices.iter().chain(default), bind_devices)
} else {
devicer.create_devices(rootfs, &default_devices(), bind_devices)
}?;