From df23c21198f19ec04e1b76d1bb9658447de8054c Mon Sep 17 00:00:00 2001 From: lissav Date: Thu, 26 Jul 2012 15:20:49 +0000 Subject: [PATCH] more testing git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13352 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/scripts/xdcpmerge.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xCAT-server/share/xcat/scripts/xdcpmerge.sh b/xCAT-server/share/xcat/scripts/xdcpmerge.sh index 81f65b68e..a2d602d78 100755 --- a/xCAT-server/share/xcat/scripts/xdcpmerge.sh +++ b/xCAT-server/share/xcat/scripts/xdcpmerge.sh @@ -9,8 +9,14 @@ #For example: #/tmp/myusers:/etc/passwd /tmp/mypasswds:/etc/shadow /tmp/mygrps:/etc/group # + +# Check for Linux, AIX not supported + +if [ "$(uname -s)" != "Linux" ]; then + logger -t xCAT -p local4.err "Merge: xdcp merge is only supported on Linux" + exit 1 +fi #this is the base path to the merge directory -logger -t xCAT "xdcp merge started" nodesyncfiledir=$1 #this is the backup copy of the original current file nodesyncfiledirorg="$nodesyncfiledir/org" @@ -36,7 +42,7 @@ for i in $*; do # if curfile not /etc/passwd or /etc/shadow or /etc/group # exit error #if [ "$curfile" != "/etc/passwd" ] && [ "$curfile" != "/etc/shadow" ] && [ "$curfile" != "/etc/group" ]; then - # `logger -t xCAT -p local4.err "Merge: $curfile is not /etc/passwd or /etc/shadow or /etc/group. It cannot be processes." ` + # logger -t xCAT -p local4.err "Merge: $curfile is not /etc/passwd or /etc/shadow or /etc/group. It cannot be processes." # exit 1 #fi # get the directory to backup the original file @@ -101,5 +107,4 @@ for i in $*; do # echo "rm $mergefile.userlist" done -logger -t xCAT "xdcp merge complete" exit 0