Skip to content

Commit 6f51181

Browse files
committed
add warning and list /usr/etc files if they exist
1 parent 53d39ca commit 6f51181

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

1_prune.sh

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,11 @@ rm -rf \
8686
# OSTree will error out if both dirs exist
8787
# And rpm-ostree will be confused and use only one of them
8888
if [ -d ./usr/etc ]; then
89-
# # Fix dir perms
90-
# # These may prevent the system from booting
91-
# # Systemd expects certain dirs to be readable only by root
92-
# echo Fixing /usr/etc dir perms
93-
# pushd ./usr/etc
94-
# find . -type d -exec chown -v --reference='{}' ../../etc/'{}' \; | grep changed
95-
# find . -type d -exec chmod -v --reference='{}' ../../etc/'{}' \; | grep changed
96-
# popd
97-
# Sync
98-
echo Merging /usr/etc to /etc
89+
echo WARNING: FOUND /usr/etc. MERGING TO ETC FOR COMPATIBILITY
90+
echo EXPECT PERMISSIONS ISSUES ON THE MERGED PATHS
91+
echo The following files from /usr/etc will be merged to /etc:
92+
tree ./usr/etc
93+
9994
$RSYNC ./usr/etc/ ./etc
10095
rm -rf ./usr/etc
10196
fi

0 commit comments

Comments
 (0)