Extract more config parser

This commit is contained in:
jonct 2024-07-15 00:44:44 -04:00
parent b25c964231
commit 2718c89613
No known key found for this signature in database
1 changed files with 3 additions and 15 deletions

View File

@ -139,7 +139,8 @@ else:
DISCLAIMER = f"""{YELLOW}{BOLD}{__disclaimer__}{NORMAL}""" DISCLAIMER = f"""{YELLOW}{BOLD}{__disclaimer__}{NORMAL}"""
from utils.config_parser import KeyValueParser, ExceptionWithParser from utils.config_parser import ExceptionWithParser, KeyValueParser
from utils.config_parser import parse_config_file
# Workaround for exit_on_error=False not applying to: # Workaround for exit_on_error=False not applying to:
@ -381,20 +382,6 @@ def shell_jail(args):
return subprocess.run(["machinectl", "shell"] + args).returncode return subprocess.run(["machinectl", "shell"] + args).returncode
def parse_config_file(jail_config_path):
config = KeyValueParser()
# Read default config to fallback to default values
# for keys not found in the jail_config_path file
config.read_default_string(DEFAULT_CONFIG)
try:
with open(jail_config_path, "r") as fp:
config.read_file(fp)
return config
except FileNotFoundError:
eprint(f"Unable to find config file: {jail_config_path}.")
return
def systemd_escape_path(path): def systemd_escape_path(path):
""" """
Escape path containing spaces, while properly handling backslashes in filenames. Escape path containing spaces, while properly handling backslashes in filenames.
@ -1383,6 +1370,7 @@ def list_jails():
) )
return 0 return 0
from utils.parent_dataset import get_all_jail_names
from utils.jail_dataset import parse_os_release from utils.jail_dataset import parse_os_release