shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

dissect-image: fix log level in dissect_log_error

Browse Source 
Actually use the log_level argument in this function!

Fixes 4953e39
This commit is contained in:
Quintin Hill 2023-04-19 12:36:00 +01:00 committed by Mike Yuan
parent 6b7e774b5d
commit 0214ead6ee
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/shared/dissect-image.c
View File

@ -1585,43 +1585,43 @@ int dissect_log_error(int log_level, int r, const char *name, const VeritySettin
return r; return r;
case -EOPNOTSUPP: case -EOPNOTSUPP:
return log_error_errno(r, "Dissecting images is not supported, compiled without blkid support."); return log_full_errno(log_level, r, "Dissecting images is not supported, compiled without blkid support.");
case -ENOPKG: case -ENOPKG:
return log_error_errno(r, "%s: Couldn't identify a suitable partition table or file system.", name); return log_full_errno(log_level, r, "%s: Couldn't identify a suitable partition table or file system.", name);
case -ENOMEDIUM: case -ENOMEDIUM:
return log_error_errno(r, "%s: The image does not pass os-release/extension-release validation.", name); return log_full_errno(log_level, r, "%s: The image does not pass os-release/extension-release validation.", name);
case -EADDRNOTAVAIL: case -EADDRNOTAVAIL:
return log_error_errno(r, "%s: No root partition for specified root hash found.", name); return log_full_errno(log_level, r, "%s: No root partition for specified root hash found.", name);
case -ENOTUNIQ: case -ENOTUNIQ:
return log_error_errno(r, "%s: Multiple suitable root partitions found in image.", name); return log_full_errno(log_level, r, "%s: Multiple suitable root partitions found in image.", name);
case -ENXIO: case -ENXIO:
return log_error_errno(r, "%s: No suitable root partition found in image.", name); return log_full_errno(log_level, r, "%s: No suitable root partition found in image.", name);
case -EPROTONOSUPPORT: case -EPROTONOSUPPORT:
return log_error_errno(r, "Device '%s' is a loopback block device with partition scanning turned off, please turn it on.", name); return log_full_errno(log_level, r, "Device '%s' is a loopback block device with partition scanning turned off, please turn it on.", name);
case -ENOTBLK: case -ENOTBLK:
return log_error_errno(r, "%s: Image is not a block device.", name); return log_full_errno(log_level, r, "%s: Image is not a block device.", name);
case -EBADR: case -EBADR:
return log_error_errno(r, return log_full_errno(log_level, r,
"Combining partitioned images (such as '%s') with external Verity data (such as '%s') not supported. " "Combining partitioned images (such as '%s') with external Verity data (such as '%s') not supported. "
"(Consider setting $SYSTEMD_DISSECT_VERITY_SIDECAR=0 to disable automatic discovery of external Verity data.)", "(Consider setting $SYSTEMD_DISSECT_VERITY_SIDECAR=0 to disable automatic discovery of external Verity data.)",
name, strna(verity ? verity->data_path : NULL)); name, strna(verity ? verity->data_path : NULL));
case -ERFKILL: case -ERFKILL:
return log_error_errno(r, "%s: image does not match image policy.", name); return log_full_errno(log_level, r, "%s: image does not match image policy.", name);
case -ENOMSG: case -ENOMSG:
return log_error_errno(r, "%s: no suitable partitions found.", name); return log_full_errno(log_level, r, "%s: no suitable partitions found.", name);
default: default:
return log_error_errno(r, "%s: cannot dissect image: %m", name); return log_full_errno(log_level, r, "%s: cannot dissect image: %m", name);
} }
} }