Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions build_files/shared/clean-stage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,19 @@ systemctl disable flatpak-add-fedora-repos.service
systemctl mask flatpak-add-fedora-repos.service
rm -f /usr/lib/systemd/system/flatpak-add-fedora-repos.service

# Relink rpm-ostree-base-db to rpmdb to ensure it correctly reflects the system
# image's rpmdb and doesn't carry over package info from the base image.
# See: https://github.com/coreos/rpm-ostree/issues/4554
# https://forge.fedoraproject.org/atomic/tracker/issues/82
for file in rpmdb.sqlite rpmdb.sqlite-shm rpmdb.sqlite-wal; do
target="/usr/share/rpm/${file}"
link_path="/usr/lib/sysimage/rpm-ostree-base-db/${file}"
if [[ -f "${target}" && -f "${link_path}" ]]; then
# Note, this needs to be a hardlink, not a symbolic link.
ln -f "${target}" "${link_path}"
fi
done

rm -rf /.gitkeep

find /var/* -maxdepth 0 -type d \! -name cache -exec rm -fr {} \;
Expand Down
Loading