From 95e0cfcb50d8815798f78eceea79d2416e08c5b2 Mon Sep 17 00:00:00 2001 From: mxi1 Date: Mon, 16 Feb 2009 12:12:21 +0000 Subject: [PATCH] fix two silly bugs git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2752 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT/postscripts/otherpkgs | 6 +++--- xCAT/postscripts/xcatdsklspost | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT/postscripts/otherpkgs b/xCAT/postscripts/otherpkgs index 922d18bb6..edc627665 100755 --- a/xCAT/postscripts/otherpkgs +++ b/xCAT/postscripts/otherpkgs @@ -35,7 +35,7 @@ if [[ $OSTYPE = linux* ]]; then SIP=`grep -h DHCPSID /var/lib/dhcpcd/*.info|awk -F= '{print $2}'|tail -n 1` fi #update SIP for SLES11 -if [ $OSVER=='sles11' ]; then +if [ "$OSVER" = "sles11" ]; then SIP=`echo $SIP |awk -F\' '{print $2}'` #trim ' fi @@ -93,8 +93,8 @@ fi rpm -q zypper if [ $? -eq 0 ]; then #use zypper - if [ $OSVER=='sles11' ]; then - zypper ar ftp://$SIP/post/otherpkgs/$OSVER/$ARCH/1 otherpkgs + if [ "$OSVER" = "sles11" ]; then + zypper ar ftp://$SIP/post/otherpkgs/$OSVER/$ARCH/1 otherpkgs else zypper sa ftp://$SIP/post/otherpkgs/$OSVER/$ARCH/1 fi diff --git a/xCAT/postscripts/xcatdsklspost b/xCAT/postscripts/xcatdsklspost index b292e134f..e774ea2df 100755 --- a/xCAT/postscripts/xcatdsklspost +++ b/xCAT/postscripts/xcatdsklspost @@ -24,7 +24,7 @@ if [ -z "$SIP" ]; then fi #echo "SIP=$SIP" -if [ $OSVER=='11' ]; then +if [ "$OSVER" = "11" ]; then SIP=`echo $SIP |awk -F\' '{print $2}'` #trim ' fi @@ -97,7 +97,7 @@ if [ $# -eq 0 ]; then echo "updateflag.awk \$MASTER 3002 \"installstatus booted\"" >> /tmp/mypostscript fi -if [ $OSVER=='11' ]; then #for SLES11 +if [ "$OSVER" = "11" ]; then #for SLES11 DHCP_TMP=`sed 's/\(DHCPINTERFACES=\)\(.*\)$/\1"\2"/' /tmp/mypostscript` echo "$DHCP_TMP" > /tmp/mypostscript fi