From ae075fe76622b379e05a23a8e89e324fe219591d Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 14 Aug 2025 16:31:19 -0400 Subject: [PATCH] bootc-base-imagectl: make `--add-dir` use `ostree-override-layers` instead The "override" semantic is closer to what most users expect I think from `--add-dir` rather than having it error out if some files already exist. This makes it closer to how e.g. `COPY` works in Dockerfiles. --- bootc-base-imagectl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootc-base-imagectl b/bootc-base-imagectl index 0eff4aa..335e470 100755 --- a/bootc-base-imagectl +++ b/bootc-base-imagectl @@ -40,7 +40,7 @@ def run_build_rootfs(args): tmp_ostree_repo = tempfile.mkdtemp(dir='/var/tmp') subprocess.check_call(['ostree', 'init', '--repo', tmp_ostree_repo, '--mode=bare']) rpmostree_argv.append(f"--ostree-repo={tmp_ostree_repo}") - override_manifest['ostree-layers'] = [] + override_manifest['ostree-override-layers'] = [] for dir in args.add_dir: base = os.path.basename(dir) @@ -48,7 +48,7 @@ def run_build_rootfs(args): # capture output to hide commit digest printed subprocess.check_output(['ostree', 'commit', '--repo', tmp_ostree_repo, '-b', f'overlay/{base}', abs, '--owner-uid=0', '--owner-gid=0', '--no-xattrs', '--mode-ro-executables']) - override_manifest['ostree-layers'].append(f'overlay/{base}') + override_manifest['ostree-override-layers'].append(f'overlay/{base}') if args.no_docs: override_manifest['documentation'] = False if args.sysusers: