diff --git a/build_files/build.sh b/build_files/build.sh index a0b8332..aa45b4f 100755 --- a/build_files/build.sh +++ b/build_files/build.sh @@ -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.