mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-11 06:56:58 +02:00
build_library/build_image_util.sh: Remove temporary /etc backup
The temporary /etc backup created during emerging packages should only contain empty files that will make sure that the symlinks pointing to files within the /etc backup won't dangle at any time.
This commit is contained in:
parent
bd2bf6acec
commit
27f20f6e26
@ -836,9 +836,18 @@ EOF
|
|||||||
sudo setfiles -Dv -r "${root_fs_dir}" "${root_fs_dir}"/etc/selinux/mcs/contexts/files/file_contexts "${root_fs_dir}"/etc
|
sudo setfiles -Dv -r "${root_fs_dir}" "${root_fs_dir}"/etc/selinux/mcs/contexts/files/file_contexts "${root_fs_dir}"/etc
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Backup the /etc contents to /usr/share/flatcar/etc to serve as source
|
# Backup the /etc contents to /usr/share/flatcar/etc to serve as
|
||||||
# for creating missing files
|
# source for creating missing files. Make sure that the preexisting
|
||||||
|
# /usr/share/flatcar/etc does not have any meaningful (non-empty)
|
||||||
|
# files, so we remove nothing important. There shouldn't be any
|
||||||
|
# symlinks either. Add "! -type d" to exclude directories as "stat"
|
||||||
|
# usually returns a size of a directory being 4096 or so.
|
||||||
|
if [[ $(sudo find "${root_fs_dir}/usr/share/flatcar/etc" -size +0 ! -type d 2>/dev/null | wc -l) -gt 0 ]]; then
|
||||||
|
die "Unexpected non-empty files in ${root_fs_dir}/usr/share/flatcar/etc"
|
||||||
|
fi
|
||||||
|
sudo rm -rf "${root_fs_dir}/usr/share/flatcar/etc"
|
||||||
sudo cp -a "${root_fs_dir}/etc" "${root_fs_dir}/usr/share/flatcar/etc"
|
sudo cp -a "${root_fs_dir}/etc" "${root_fs_dir}/usr/share/flatcar/etc"
|
||||||
|
|
||||||
# Remove the rootfs state as it should be recreated through the
|
# Remove the rootfs state as it should be recreated through the
|
||||||
# tmpfiles and may not be present on updating machines. This
|
# tmpfiles and may not be present on updating machines. This
|
||||||
# makes sure our tests cover the case of missing files in the
|
# makes sure our tests cover the case of missing files in the
|
||||||
|
Loading…
Reference in New Issue
Block a user