From 2618459ba1ccf1ff781989423f195355d462973d Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Sun, 4 Oct 2009 16:16:00 -0400
Subject: [PATCH] If a file is already FatELF, do a replace instead of a glue.

---
 misc/merge.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/misc/merge.sh b/misc/merge.sh
index 359a0ff..183c2a8 100755
--- a/misc/merge.sh
+++ b/misc/merge.sh
@@ -22,7 +22,13 @@ time for feh in bin boot etc lib opt sbin usr var ; do find /x86/$feh -type f -e
 for feh in `cat binaries-32` ; do
     mkdir -p --mode=0755 `dirname "/$feh"`
     if [ -f "/$feh" ]; then
-        ./fatelf-glue tmp-fatelf "/$feh" "/x86/$feh"
+        FATELF=0
+        ./fatelf-validate "/$feh" && ISFATELF=1
+        if [ "x$ISFATELF" = "x1" ]; then
+            ./fatelf-replace tmp-fatelf "/$feh" "/x86/$feh"
+        else
+            ./fatelf-glue tmp-fatelf "/$feh" "/x86/$feh"
+        fi
         chmod --reference="/$feh" tmp-fatelf
         mv tmp-fatelf "/$feh"
     else