particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

image-info: read systemd-logind configs from multiple paths

Browse source 
Extend image-info to read systemd-logind configuration files from
multiple paths:
 - /etc/systemd/logind.conf
 - /etc/systemd/logind.conf.d/*.conf
 - /usr/lib/systemd/logind.conf.d/*.conf

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2021-08-24 13:22:50 +02:00 • committed by Achilleas Koutsou
parent fb982b20b9
commit 9e719a0c33
1 changed files with 42 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

55
tools/image-info
View file

@ -793,9 +793,10 @@ def read_hosts(tree):
return result return result
def read_logind_conf(tree): def read_logind_config(config_path):
""" """
Read all uncommented key/values set in /etc/systemd/logind.conf. Read all uncommented key/values from the 'Login" section of system-logind
configuration file.
Returns: dictionary with key/values read from the configuration file. Returns: dictionary with key/values read from the configuration file.
The returned dictionary may be empty. The returned dictionary may be empty.
@ -807,17 +808,45 @@ def read_logind_conf(tree):
""" """
result = {} result = {}
with contextlib.suppress(FileNotFoundError): with open(config_path) as f:
with open(f"{tree}/etc/systemd/logind.conf") as f: parser = configparser.RawConfigParser()
parser = configparser.RawConfigParser() # prevent conversion of the option name to lowercase
# prevent conversion of the option name to lowercase parser.optionxform = lambda option: option
parser.optionxform = lambda option: option parser.read_file(f)
parser.read_file(f) with contextlib.suppress(configparser.NoSectionError):
with contextlib.suppress(configparser.NoSectionError): result.update(parser["Login"])
result.update(parser["Login"])
return result return result
def read_logind_configs(tree):
"""
Read all systemd-logind *.conf files from a predefined list of paths and
parse them.
The searched paths are:
- "/etc/systemd/logind.conf"
- "/etc/systemd/logind.conf.d/*.conf"
- "/usr/lib/systemd/logind.conf.d/*.conf"
Returns: dictionary as returned by '_read_glob_paths_with_parser()' with
configuration representation as returned by 'read_logind_config()'.
An example return value:
{
"/etc/systemd/logind.conf": {
"NAutoVTs": "0"
}
}
"""
checked_globs = [
"/etc/systemd/logind.conf",
"/etc/systemd/logind.conf.d/*.conf",
"/usr/lib/systemd/logind.conf.d/*.conf"
]
return _read_glob_paths_with_parser(tree, checked_globs, read_logind_config)
def read_locale(tree): def read_locale(tree):
""" """
Read all uncommented key/values set in /etc/locale.conf. Read all uncommented key/values set in /etc/locale.conf.
@ -1826,9 +1855,9 @@ def append_filesystem(report, tree, *, is_ostree=False):
if locale: if locale:
report["locale"] = locale report["locale"] = locale
logind = read_logind_conf(tree) logind_configs = read_logind_configs(tree)
if logind: if logind_configs:
report["logind.conf"] = logind report["systemd-logind"] = logind_configs
with contextlib.suppress(FileNotFoundError): with contextlib.suppress(FileNotFoundError):
with open(f"{tree}/etc/machine-id") as f: with open(f"{tree}/etc/machine-id") as f: