davejansen/fedora-bootc
1
0
Fork 1
Code Issues 2 Pull Requests Actions 2 Packages Releases Activity

One step back
Some checks failed
Build container image / Build and push image (push) Failing after 3m1s
Details

Browse Source
This commit is contained in:
Dave Jansen
2025-12-01 17:58:51 +09:00
parent e4afe6923f
commit 6328eadaff
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
build_files/build.sh
View File

@@ -164,23 +164,23 @@ rm -rf \
/etc/subgid- \
/.dockerenv
# Merge /usr/etc to /etc
# OSTree will error out if both dirs exist
# And rpm-ostree will be confused and use only one of them
if [ -d /usr/etc ]; then
echo
echo WARNING: FOUND /usr/etc. MERGING TO ETC FOR COMPATIBILITY
echo EXPECT PERMISSIONS ISSUES ON THE MERGED PATHS
echo The following files from /usr/etc will be merged to /etc:
tree /usr/etc
echo
rsync -aAX --numeric-ids --checksum --links /usr/etc/ /etc
rm -rf /usr/etc
fi
# Move /etc to /usr/etc
mv /etc /usr/
# # Merge /usr/etc to /etc
# # OSTree will error out if both dirs exist
# # And rpm-ostree will be confused and use only one of them
# if [ -d /usr/etc ]; then
# echo
# echo WARNING: FOUND /usr/etc. MERGING TO ETC FOR COMPATIBILITY
# echo EXPECT PERMISSIONS ISSUES ON THE MERGED PATHS
# echo The following files from /usr/etc will be merged to /etc:
# tree /usr/etc
#
# echo
# rsync -aAX --numeric-ids --checksum --links /usr/etc/ /etc
# rm -rf /usr/etc
# fi
#
# # Move /etc to /usr/etc
# mv /etc /usr/
# ...normal ublue-inspired steps continue.