particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

stages/ostree.passwd: fix subid source path

Browse source 
The sub{g,u}id files in the commit are located in `/usr/etc` not
`/etc`. Read the files from there.
This commit is contained in:
Christian Kellner 2022-05-16 15:34:03 +02:00 • committed by Achilleas Koutsou
parent 20daf92cf3
commit e51d08ba9e
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
stages/org.osbuild.ostree.passwd
View file

@ -92,12 +92,12 @@ def main(tree, inputs, _options):
passwd.merge_with_file(os.path.join(checkout_root, "usr/lib/group"), allow_missing_file=False)
passwd.dump_to_file(os.path.join(tree, "etc/group"))
# Merge /etc/sub{g,u}id with /etc/sub{g,u}id from the checkout and store it in the buildroot
# Merge /etc/sub{g,u}id with /usr/etc/sub{g,u}id from the checkout and store it in the buildroot
with contextlib.suppress(FileNotFoundError):
subuids.read_from(os.path.join(checkout_root, SUBUID_PATH))
subuids.read_from(os.path.join(checkout_root, "usr", SUBUID_PATH))
with contextlib.suppress(FileNotFoundError):
subgids.read_from(os.path.join(checkout_root, SUBGID_PATH))
subgids.read_from(os.path.join(checkout_root, "usr", SUBGID_PATH))
# If we have entries in the subordinate id files, write them to the tree
if subuids: