From dc0f50499702f0586165b852b76c4ab11f431e6c Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Thu, 14 Apr 2011 18:56:00 +0000 Subject: [PATCH] -Make url parsing greedy so as not to be confused by too many colons git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9318 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/netboot/rh/dracut/xcatroot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot b/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot index 6f5df03a7..759f85cea 100755 --- a/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot +++ b/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot @@ -4,7 +4,7 @@ RWDIR=.statelite XCATMASTER=$XCAT if [ ! -z "$imgurl" ]; then - if [ xhttp = x${imgurl%:*} ]; then + if [ xhttp = x${imgurl%%:*} ]; then NFS=0 FILENAME=${imgurl##*/} while [ ! -r "$FILENAME" ]; do @@ -14,7 +14,7 @@ if [ ! -z "$imgurl" ]; then sleep 27 fi done - elif [ xnfs = x${imgurl%:*} ]; then + elif [ xnfs = x${imgurl%%:*} ]; then NFS=1 SERVER=${imgurl#nfs:} SERVER=${SERVER#/}