arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix defect 3642

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16752 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2013-06-25 15:30:35 +00:00
parent e95b7084b9
commit 46c918d22d
1 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
xCAT/postscripts/otherpkgs.ubuntu
View File

@ -316,20 +316,20 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
if [ $hasyum -eq 1 ]; then
echo "yum -y remove $repo_pkgs_preremove"
result=`yum -y remove $repo_pkgs_preremove 2>&1`
logger -t xcat -p local4.info "$result"
if [ $? -ne 0 ]; then
RETURNVAL=$?
logger -t xcat -p local4.info "otherpkgs: $result"
R=$?
if [ $R -ne 0 ]; then
RETURNVAL=$R
fi
logger -t xcat -p local4.info "otherpkgs: $result"
echo "$result"
elif [ $haszypper -eq 1 ]; then
echo "zypper remove -y $repo_pkgs_preremove"
result=`zypper remove -y $repo_pkgs_preremove 2>&1`
logger -t xcat -p local4.info "$result"
if [ $? -ne 0 ]; then
RETURNVAL=$?
logger -t xcat -p local4.info "otherpkgs: $result"
R=$?
if [ $R -ne 0 ]; then
RETURNVAL=$R
fi
logger -t xcat -p local4.info "otherpkgs: $result"
echo "$result"
fi
fi
@ -337,11 +337,11 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
if [ "$plain_pkgs_preremove" != "" ]; then
echo "$sremovecommand $plain_pkgs_preremove"
result=`$sremovecommand $plain_pkgs_preremove 2>&1`
logger -t xcat -p local4.info "$result"
if [ $? -ne 0 ]; then
RETURNVAL=$?
logger -t xcat -p local4.info "otherpkgs $result"
R=$?
if [ $R -ne 0 ]; then
RETURNVAL=$R
fi
logger -t xcat -p local4.info "otherpkgs $result"
echo "$result"
fi
@ -351,20 +351,20 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
if [ $hasyum -eq 1 ]; then
echo "yum -y install $repo_pkgs"
result=`yum -y install $repo_pkgs 2>&1`
logger -t xcat -p local4.info "$result"
if [ $? -ne 0 ]; then
RETURNVAL=$?
logger -t xcat -p local4.info "otherpkgs: $result"
R=$?
if [ $R -ne 0 ]; then
RETURNVAL=$R
fi
logger -t xcat -p local4.info "otherpkgs: $result"
echo "$result"
elif [ $haszypper -eq 1 ]; then
echo "zypper install -y $repo_pkgs"
result=`zypper install -y $repo_pkgs 2>&1`
logger -t xcat -p local4.info "$result"
if [ $? -ne 0 ]; then
RETURNVAL=$?
logger -t xcat -p local4.info "otherpkgs: $result"
R=$?
if [ $R -ne 0 ]; then
RETURNVAL=$R
fi
logger -t xcat -p local4.info "otherpkgs: $result"
echo "$result"
#remove the repos
#old_repo=`zypper lr -u |grep xcat-otherpkgs | cut -f2 -d '|'`
@ -375,11 +375,11 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
elif [ $hasapt -eq 1 ]; then
echo "apt-get -q -y --force-yes install $repo_pkgs"
result=`apt-get -q -y --force-yes install $repo_pkgs 2>&1`
logger -t xcat -p local4.info "$result"
if [ $? -ne 0 ]; then
RETURNVAL=$?
logger -t xcat -p local4.info "otherpkgs: $result"
R=$?
if [ $R -ne 0 ]; then
RETURNVAL=$R
fi
logger -t xcat -p local4.info "otherpkgs: $result"
echo "$result"
fi
fi
@ -427,29 +427,29 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
if [ $hasyum -eq 1 ]; then
echo "yum -y remove $repo_pkgs_postremove"
result=`yum -y remove $repo_pkgs_postremove 2>&1`
logger -t xcat -p local4.info "$result"
if [ $? -ne 0 ]; then
RETURNVAL=$?
logger -t xcat -p local4.info "otherpkgs: $result"
R=$?
if [ $R -ne 0 ]; then
RETURNVAL=$R
fi
logger -t xcat -p local4.info "otherpkgs: $result"
echo "$result"
elif [ $haszypper -eq 1 ]; then
echo "zypper remove -y $repo_pkgs_postremove"
result=`zypper remove -y $repo_pkgs_postremove 2>&1`
logger -t xcat -p local4.info "$result"
if [ $? -ne 0 ]; then
RETURNVAL=$?
logger -t xcat -p local4.info "otherpkgs: $result"
R=$?
if [ $R -ne 0 ]; then
RETURNVAL=$R
fi
logger -t xcat -p local4.info "otherpkgs: $result"
echo "$result"
elif [ $hasapt -eq 1 ]; then
echo "apt-get -y remove $repo_pkgs_postremove"
result=`apt-get -y remove $repo_pkgs_postremove 2>&1`
logger -t xcat -p local4.info "$result"
if [ $? -ne 0 ]; then
RETURNVAL=$?
logger -t xcat -p local4.info "otherpkgs: $result"
R=$?
if [ $R -ne 0 ]; then
RETURNVAL=$R
fi
logger -t xcat -p local4.info "otherpkgs: $result"
echo "$result"
fi
fi
@ -457,11 +457,11 @@ while [ $op_index -le $OTHERPKGS_INDEX ]; do
if [ "$plain_pkgs_postremove" != "" ]; then
echo "$sremovecommand $plain_pkgs_postremove"
result=`$sremovecommand $plain_pkgs_postremove 2>&1`
logger -t xcat -p local4.info "$result"
if [ $? -ne 0 ]; then
RETURNVAL=$?
logger -t xcat -p local4.info "otherpkgs $result"
R=$?
if [ $R -ne 0 ]; then
RETURNVAL=$R
fi
logger -t xcat -p local4.info "otherpkgs $result"
echo "$result"
fi