mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-10 14:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(base_image_util): Do not auto-generate conflicting tmpfiles entries

Browse Source 
Many directories are now handled by the new baselayout instead.
This commit is contained in:
Michael Marineau 2014-02-14 16:13:31 -08:00
parent ae67e89159
commit 438478f0cf
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build_library/base_image_util.sh
View File

@ -38,14 +38,16 @@ create_base_image() {
sudo ROOT="${root_fs_dir}" env-update sudo ROOT="${root_fs_dir}" env-update
# Record directories installed to the state partition. # Record directories installed to the state partition.
# Ignore /var/tmp, systemd covers this entry. # Explicitly ignore entries covered by existing configs.
local tmp_ignore=$(awk '/^[dDfFL]/ {print "--ignore=" $2}' \
"${root_fs_dir}"/usr/lib/tmpfiles.d/*.conf)
sudo "${BUILD_LIBRARY_DIR}/gen_tmpfiles.py" --root="${root_fs_dir}" \ sudo "${BUILD_LIBRARY_DIR}/gen_tmpfiles.py" --root="${root_fs_dir}" \
--output="${root_fs_dir}/usr/lib/tmpfiles.d/base_image_var.conf" \ --output="${root_fs_dir}/usr/lib/tmpfiles.d/base_image_var.conf" \
--ignore=/var/tmp "${root_fs_dir}/var" ${tmp_ignore} "${root_fs_dir}/var"
if [[ "${disk_layout}" == *-usr ]]; then if [[ "${disk_layout}" == *-usr ]]; then
sudo "${BUILD_LIBRARY_DIR}/gen_tmpfiles.py" --root="${root_fs_dir}" \ sudo "${BUILD_LIBRARY_DIR}/gen_tmpfiles.py" --root="${root_fs_dir}" \
--output="${root_fs_dir}/usr/lib/tmpfiles.d/base_image_etc.conf" \ --output="${root_fs_dir}/usr/lib/tmpfiles.d/base_image_etc.conf" \
"${root_fs_dir}/etc" ${tmp_ignore} "${root_fs_dir}/etc"
fi fi
# Set /etc/lsb-release on the image. # Set /etc/lsb-release on the image.