From ee54a2cc7b282d36e28379d5784d7c93954ed2ab Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 8 Mar 2018 10:12:08 -0500
Subject: [PATCH] Fix xdcpmerge when no common

The fix for superset broke the null intersection case.
The null intersection case becomes a simple append, so
add as an else clause.
---
 xCAT-server/share/xcat/scripts/xdcpmerge.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xCAT-server/share/xcat/scripts/xdcpmerge.sh b/xCAT-server/share/xcat/scripts/xdcpmerge.sh
index 39922add6..d3e096f2d 100755
--- a/xCAT-server/share/xcat/scripts/xdcpmerge.sh
+++ b/xCAT-server/share/xcat/scripts/xdcpmerge.sh
@@ -96,6 +96,8 @@ for i in $*; do
   if [ -a "$mergefile.nodups" ]; then
     cat $mergefile.nodups >> $curfile
     rm $mergefile.nodups
+  else # no set intersection, make it a simple append
+    cat $filebackup $mergefile > $curfile
   fi
   
   # now cleanup