mirror of
https://github.com/kata-containers/kata-containers.git
synced 2026-01-29 21:39:23 +00:00
Merge pull request #7718 from littlejawa/fix_filemode_when_zero
kata-agent: use default filemode for block device when it is set to 0
This commit is contained in:
@@ -423,12 +423,18 @@ fn linux_grpc_to_oci(l: &grpc::Linux) -> oci::Linux {
|
||||
let mut r = Vec::new();
|
||||
|
||||
for d in l.Devices.iter() {
|
||||
// if the filemode for the device is 0 (unset), use a default value as runc does
|
||||
let filemode = if d.FileMode != 0 {
|
||||
Some(d.FileMode)
|
||||
} else {
|
||||
Some(0o666)
|
||||
};
|
||||
r.push(oci::LinuxDevice {
|
||||
path: d.Path.clone(),
|
||||
r#type: d.Type.clone(),
|
||||
major: d.Major,
|
||||
minor: d.Minor,
|
||||
file_mode: Some(d.FileMode),
|
||||
file_mode: filemode,
|
||||
uid: Some(d.UID),
|
||||
gid: Some(d.GID),
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user