sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-04-05 01:10:03 +01:00
Code Issues Releases Wiki Activity

collector/dmesg: Fix dmesg variant detection

Browse Source 
Check for all the CLI options we are going to use when deciding whether
to use the system's dmesg or the one we ship via busybox.
This commit is contained in:
Douglas Raillard 2025-01-30 11:54:51 +00:00 committed by Marc Bonnici
parent a3765cc27d
commit facd251edb
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devlib/collector/dmesg.py
View File

@ -203,12 +203,16 @@ class DmesgCollector(CollectorBase):
)) ))
self.level = level self.level = level
# Check if dmesg is the BusyBox one, or the one from util-linux in a # Check if we have a dmesg from a recent util-linux build, rather than
# recent version. # e.g. busybox's dmesg or the one shipped on some Android versions
# Note: BusyBox dmesg does not support -h, but will still print the # (toybox). Note: BusyBox dmesg does not support -h, but will still
# help with an exit code of 1 # print the help with an exit code of 1
self.basic_dmesg = '--force-prefix' not in \ help_ = self.target.execute('dmesg -h', check_exit_code=False)
self.target.execute('dmesg -h', check_exit_code=False) self.basic_dmesg = not all(
opt in help_
for opt in ('--facility', '--force-prefix', '--decode', '--level')
)
self.facility = facility self.facility = facility
try: try:
needs_root = target.read_sysctl('kernel.dmesg_restrict') needs_root = target.read_sysctl('kernel.dmesg_restrict')