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 <luca.bruno@coreos.com>
This commit is contained in:
parent
3731a32308
commit
92cc26997f
1 changed files with 1 additions and 1 deletions
|
|
@ -81,7 +81,7 @@ TOPLEVEL_LINKS = {
|
||||||
|
|
||||||
def copy(name, source, dest):
|
def copy(name, source, dest):
|
||||||
subprocess.run(["cp", "--reflink=auto", "-a",
|
subprocess.run(["cp", "--reflink=auto", "-a",
|
||||||
os.path.join(source, name),
|
os.path.join(source, name, "."),
|
||||||
os.path.join(dest, name)],
|
os.path.join(dest, name)],
|
||||||
check=True)
|
check=True)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue