Skip to content

Commit

Permalink
add warning and list /usr/etc files if they exist
Browse files Browse the repository at this point in the history
  • Loading branch information
antheas committed Aug 8, 2024
1 parent 53d39ca commit 6f51181
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions 1_prune.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,11 @@ rm -rf \
# 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
# # Fix dir perms
# # These may prevent the system from booting
# # Systemd expects certain dirs to be readable only by root
# echo Fixing /usr/etc dir perms
# pushd ./usr/etc
# find . -type d -exec chown -v --reference='{}' ../../etc/'{}' \; | grep changed
# find . -type d -exec chmod -v --reference='{}' ../../etc/'{}' \; | grep changed
# popd
# Sync
echo Merging /usr/etc to /etc
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

$RSYNC ./usr/etc/ ./etc
rm -rf ./usr/etc
fi
Expand Down

0 comments on commit 6f51181

Please sign in to comment.