From 92cc26997fec0a036dc218c0db8b335050660709 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Tue, 15 Jun 2021 17:30:19 +0000 Subject: [PATCH] assemblers/ostree: fix copying of `var` In the ostree assembler, `var`, `usr` and `boot` are copied from the built tree to a newly initialized and ostree-conforming root filesystem. The way in which `cp` was called resulted in the source being created inside the target, if the latter existed. This was the case for `var` resulting in `var/var`. Use `cp ${source}/. {target}` to fix that. Reported-by: Luca Bruno --- assemblers/org.osbuild.ostree.commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assemblers/org.osbuild.ostree.commit b/assemblers/org.osbuild.ostree.commit index b97257ef..83850f7d 100755 --- a/assemblers/org.osbuild.ostree.commit +++ b/assemblers/org.osbuild.ostree.commit @@ -81,7 +81,7 @@ TOPLEVEL_LINKS = { def copy(name, source, dest): subprocess.run(["cp", "--reflink=auto", "-a", - os.path.join(source, name), + os.path.join(source, name, "."), os.path.join(dest, name)], check=True)