shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

ukify: Introduce resolve_at_path()

Browse Source
This commit is contained in:
Daan De Meyer 2024-10-07 11:29:40 +02:00
parent be64d42f9f
commit eca003de2f
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ukify/ukify.py
View File

@ -1801,6 +1801,13 @@ def create_parser() -> argparse.ArgumentParser:
return p
def resolve_at_path(value: Optional[str]) -> str:
if value and value.startswith('@'):
return Path(value[1:])
return value
def finalize_options(opts: argparse.Namespace) -> None:
# Figure out which syntax is being used, one of:
# ukify verb --arg --arg --arg
@ -1835,17 +1842,17 @@ def finalize_options(opts: argparse.Namespace) -> None:
if n_phase_path_groups is not None and n_phase_path_groups != n_pcr_priv:
raise ValueError('--phases= specifications must match --pcr-private-key=')
if opts.cmdline and opts.cmdline.startswith('@'):
opts.cmdline = Path(opts.cmdline[1:])
elif opts.cmdline:
opts.cmdline = resolve_at_path(opts.cmdline)
if isinstance(opts.cmdline, str):
# Drop whitespace from the command line. If we're reading from a file,
# we copy the contents verbatim. But configuration specified on the command line
# or in the config file may contain additional whitespace that has no meaning.
opts.cmdline = ' '.join(opts.cmdline.split())
if opts.os_release and opts.os_release.startswith('@'):
opts.os_release = Path(opts.os_release[1:])
elif not opts.os_release and opts.linux:
opts.os_release = resolve_at_path(opts.os_release)
if not opts.os_release and opts.linux:
p = Path('/etc/os-release')
if not p.exists():
p = Path('/usr/lib/os-release')