Accepting request 900334 from home:lnussel:usrmove

- another fix for split /usr to avoid running out of space (boo#1186781)

OBS-URL: https://build.opensuse.org/request/show/900334
OBS-URL: https://build.opensuse.org/package/show/Base:System/compat-usrmerge?expand=0&rev=19
This commit is contained in:
Ludwig Nussel 2021-06-16 08:20:00 +00:00 committed by Git OBS Bridge
parent be2a961a1f
commit dd9e771105
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jun 15 15:27:41 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
- another fix for split /usr to avoid running out of space (boo#1186781)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 8 12:03:52 UTC 2021 - Ludwig Nussel <lnussel@suse.de> Tue Jun 8 12:03:52 UTC 2021 - Ludwig Nussel <lnussel@suse.de>

View File

@ -78,7 +78,7 @@ for dir in bin sbin lib lib64; do
echo "Merge the copy with \`$ROOT/usr/$dir'." echo "Merge the copy with \`$ROOT/usr/$dir'."
[[ -d "$ROOT/usr/${dir}.usrmerge" ]] \ [[ -d "$ROOT/usr/${dir}.usrmerge" ]] \
|| mkdir -p "$ROOT/usr/${dir}.usrmerge" || mkdir -p "$ROOT/usr/${dir}.usrmerge"
cp -axT $CP_HARDLINK --backup --suffix=.usrmerge~ "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmerge" cp -axT -l --backup --suffix=.usrmerge~ "$ROOT/usr/$dir" "$ROOT/usr/${dir}.usrmerge"
echo "Clean up duplicates in \`$ROOT/usr/$dir'." echo "Clean up duplicates in \`$ROOT/usr/$dir'."
# delete all symlinks that have been backed up. /usr versions # delete all symlinks that have been backed up. /usr versions
# override / ones # override / ones