almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Add skip_branding to ostree_installer.

Browse Source 
Fixes: #1594
Merges: https://pagure.io/pungi/pull-request/1609
Signed-off-by: Lingyan Zhuang <lzhuang@redhat.com>
This commit is contained in:
Lingyan Zhuang 2022-05-07 19:58:19 +08:00 committed by Lubomír Sedlář
parent 80957f5205
commit c4aa45beab
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/configuration.rst
View File

@ -1786,6 +1786,8 @@ an OSTree repository. This always runs in Koji as a ``runroot`` task.
with the optional key: with the optional key:
* ``extra_runroot_pkgs`` -- (*[str]*) * ``extra_runroot_pkgs`` -- (*[str]*)
* ``skip_branding`` -- (*bool*) Stops lorax to install packages with branding.
Defaults to ``False``.
**ostree_installer_overwrite** = False **ostree_installer_overwrite** = False
(*bool*) -- by default if a variant including OSTree installer also creates (*bool*) -- by default if a variant including OSTree installer also creates

1
pungi/checks.py
View File

@ -1078,6 +1078,7 @@ def make_schema():
"template_repo": {"type": "string"}, "template_repo": {"type": "string"},
"template_branch": {"type": "string"}, "template_branch": {"type": "string"},
"extra_runroot_pkgs": {"$ref": "#/definitions/list_of_strings"}, "extra_runroot_pkgs": {"$ref": "#/definitions/list_of_strings"},
"skip_branding": {"type": "boolean"},
}, },
"additionalProperties": False, "additionalProperties": False,
} }

1
pungi/phases/ostree_installer.py
View File

@ -272,6 +272,7 @@ class OstreeInstallerThread(WorkerThread):
rootfs_size=config.get("rootfs_size"), rootfs_size=config.get("rootfs_size"),
is_final=compose.supported, is_final=compose.supported,
log_dir=self.logdir, log_dir=self.logdir,
skip_branding=config.get("skip_branding"),
) )
cmd = "rm -rf %s && %s" % ( cmd = "rm -rf %s && %s" % (
shlex_quote(output_dir), shlex_quote(output_dir),