diff --git a/klippy/klippy.py b/klippy/klippy.py index df86f49fa..1d3ffbf06 100644 --- a/klippy/klippy.py +++ b/klippy/klippy.py @@ -328,6 +328,7 @@ def main(): start_args['software_version'] = git_vers start_args['cpu_info'] = util.get_cpu_info() start_args['device'] = util.get_device_info() + start_args['linux_version'] = util.get_linux_version() if bglogger is not None: versions = "\n".join([ "Args: %s" % (sys.argv,), @@ -335,6 +336,7 @@ def main(): extra_git_desc), "CPU: %s" % (start_args['cpu_info'],), "Device: %s" % (start_args['device']), + "Linux: %s" % (start_args['linux_version']), "Python: %s" % (repr(sys.version),)]) logging.info(versions) elif not options.debugoutput: diff --git a/klippy/util.py b/klippy/util.py index 8e08e0438..9abb94df6 100644 --- a/klippy/util.py +++ b/klippy/util.py @@ -131,6 +131,12 @@ def get_device_info(): return "?" return data.rstrip(' \0').strip() +def get_linux_version(): + data = _try_read_file('/proc/version') + if data is None: + return "?" + return data.strip() + def get_version_from_file(klippy_src): data = _try_read_file(os.path.join(klippy_src, '.version')) if data is None: