Cloned2Preserve
/
jailmaker
mirror of https://github.com/Jip-Hop/jailmaker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Accept config template from stdin 

Closes #208
This commit is contained in:
Jip-Hop 2024-06-28 15:51:01 +02:00
parent e1f1d07872
commit 01e1156832
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jlmkr.py
View File

@ -1276,10 +1276,14 @@ def create_jail(**kwargs):
if jail_config_path: if jail_config_path:
# TODO: fallback to default values for e.g. distro and release if they are not in the config file # TODO: fallback to default values for e.g. distro and release if they are not in the config file
print(f"Creating jail {jail_name} from config template {jail_config_path}.") if jail_config_path == "-":
if jail_config_path not in config.read(jail_config_path): print(f"Creating jail {jail_name} from config template passed via stdin.")
eprint(f"Failed to read config template {jail_config_path}.") config.read_string(sys.stdin.read())
return 1 else:
print(f"Creating jail {jail_name} from config template {jail_config_path}.")
if jail_config_path not in config.read(jail_config_path):
eprint(f"Failed to read config template {jail_config_path}.")
return 1
else: else:
print(f"Creating jail {jail_name} with default config.") print(f"Creating jail {jail_name} with default config.")
config.read_string(DEFAULT_CONFIG) config.read_string(DEFAULT_CONFIG)
@ -1936,7 +1940,7 @@ def main():
commands["create"].add_argument( commands["create"].add_argument(
"-c", # "-c", #
"--config", "--config",
help="path to config file template", help="path to config file template or - for stdin",
) )
commands["create"].add_argument( commands["create"].add_argument(
"-gi", # "-gi", #