github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-06 12:06:49 +00:00
Code Issues Projects Releases Wiki Activity

genpolicy: push down warning about missing passwd file

Browse Source 
The warning used to trigger even if the passwd file was not needed. This
commit moves it down to where it actually matters.

Signed-off-by: Markus Rudy <mr@edgeless.systems>
This commit is contained in:
Markus Rudy 2025-06-03 11:17:23 +02:00
parent ec969e4dcd
commit 02ad39ddf1
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/genpolicy/src/registry.rs
View File

@ -300,10 +300,16 @@ impl Container {
"Failed to parse {} as u32, using it as a user name - error {outer_e}",
user
);
let (uid, _) = self
.get_uid_gid_from_passwd_user(user.to_string().clone())
.unwrap_or((0, 0));
uid
match self.get_uid_gid_from_passwd_user(user.to_string().clone()) {
Ok((uid, _)) => uid,
Err(err) => {
warn!(
"could not resolve named user {}, defaulting to uid 0: {}",
user, err
);
0
}
}
}
}
}
@ -329,10 +335,6 @@ impl Container {
* 6. Be erroneus, somehow
*/
if let Some(image_user) = &docker_config.User {
if self.passwd.is_empty() {
warn!("No /etc/passwd file is available, unable to parse gids from user");
}
if !image_user.is_empty() {
if image_user.contains(':') {
debug!("Splitting Docker config user = {:?}", image_user);