xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-22 19:20:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5012 from robin2008/xdcpmerge

Browse Source 
updatenode MERGE mode does not support update an existing entry
This commit is contained in:
Yuan Bai
2018-03-27 14:21:46 +08:00
committed by GitHub
parent 6d8081142b 961108c53b
commit 9a12802077
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xCAT-server/share/xcat/scripts/xdcpmerge.sh
View File

@@ -61,8 +61,8 @@ for i in $*; do
# in the merge file and create a new backup
# first get a list of duplicate lines to remove
# based on only username: the first field in the file
cut -d: -f1 $filebackup > $filebackup.userlist
cut -d: -f1 $mergefile > $mergefile.userlist
cut -d: -f1 $filebackup > $filebackup.userlist
cut -d: -f1 $mergefile > $mergefile.userlist
comm -12 <(sort $filebackup.userlist | uniq) <(sort $mergefile.userlist | uniq) > $filebackup.remove
# now if there is a remove file, use it to remove the dup lines in backup
@@ -86,16 +86,15 @@ for i in $*; do
userlist=$userlisttmp$listend
grepcmd=$grepcmd$userlist
#set -x
grepcmd="$grepcmd $mergefile > $mergefile.nodups"
#echo "grepcmd=$grepcmd"
grepcmd="$grepcmd $filebackup > $filebackup.nodups"
# now run it
eval $grepcmd
fi
# add new entries from mergefile, if any
if [ -a "$mergefile.nodups" ]; then
cat $mergefile.nodups >> $curfile
rm $mergefile.nodups
#echo "grepcmd=$grepcmd"
cat $filebackup.nodups $mergefile > $curfile
#echo "$filebackup.nodups $mergefile > $curfile"
else
cat $filebackup $mergefile > $curfile
#echo "cat $filebackup $mergefile > $curfile"
fi
# now cleanup