From: Harald Hoyer <harald@redhat.com>
Date: Thu, 26 Jan 2012 14:37:50 +0000 (+0100)
Subject: 30usrmove/usrmove-convert.sh: rename duplicate libraries
X-Git-Tag: 015~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ebad51b8461d501613f86bcc46fdda4eddbdaf9;p=thirdparty%2Fdracut.git

30usrmove/usrmove-convert.sh: rename duplicate libraries

ldconfig does not ignore the duplicate leftover libs with a .usrmove~
suffix, so we rename ".so" to "_so".
---

diff --git a/modules.d/30usrmove/usrmove-convert.sh b/modules.d/30usrmove/usrmove-convert.sh
index 8a623b359..cb93993f6 100755
--- a/modules.d/30usrmove/usrmove-convert.sh
+++ b/modules.d/30usrmove/usrmove-convert.sh
@@ -141,6 +141,14 @@ for dir in bin sbin lib lib64; do
         && rm -rf "$ROOT/${dir}.usrmove-old~" || :
 done
 
+for dir in lib lib64; do
+    [[ -d "$ROOT/$dir" ]] || continue
+    for lib in "$ROOT"/usr/${dir}/lib*.so*.usrmove~; do
+        [[ -f $lib ]] || continue
+        mv $lib ${lib/.so/_so}
+    done
+done
+
 set +e
 
 echo "Run ldconfig."