TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2026-02-15 07:29:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure consistent home directory handling in reference file comparisons (#868)

Browse Source 
Always use '/var/empty' when comparing reference files to match TrueNAS SCALE's
standard home directory for system users, preventing false cache invalidation
due to Debian's '/nonexistent' default.
This commit is contained in:
sonicaj
2025-06-04 23:24:38 +05:00
committed by GitHub
parent 5ddbc25e6a
commit 71557b080f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scale_build/bootstrap/cache.py
View File

@@ -56,7 +56,10 @@ class CacheMixin:
if intact:
self.restore_cache(self.chroot_basedir)
for reference_file, diff in compare_reference_files(cut_nonexistent_user_group_membership=True):
for reference_file, diff in compare_reference_files(
cut_nonexistent_user_group_membership=True,
default_homedir='/var/empty'
):
if diff:
intact = False
self.logger.debug(

2
scale_build/update_image.py
View File

@@ -64,7 +64,7 @@ def build_update_image_impl():
install_rootfs_packages()
for reference_file, diff in compare_reference_files():
for reference_file, diff in compare_reference_files(default_homedir='/var/empty'):
if diff:
raise CallError(
f'Reference file {reference_file!r} changed.\n'