diff --git a/mkAIXsnap b/mkAIXsnap index d38acf071..0c1f5e278 100755 --- a/mkAIXsnap +++ b/mkAIXsnap @@ -113,12 +113,19 @@ if [ $UPLOAD == 1 ]; then #while ! rsync -urLv --delete aix-core-snap nott,xcat@web.sourceforge.net:/home/groups/x/xc/xcat/htdocs/aix/devel/ #do : ; done - scp *.rpm nott,xcat@web.sourceforge.net:/home/groups/x/xc/xcat/htdocs/aix/devel/core-snap +# devel snapshot +scp *.rpm nott,xcat@web.sourceforge.net:/home/groups/x/xc/xcat/htdocs/aix/devel/core-snap +scp core-aix-snap.tar.gz nott,xcat@web.sourceforge.net:/home/groups/x/xc/xcat/htdocs/aix/devel - scp core-aix-snap.tar.gz nott,xcat@web.sourceforge.net:/home/groups/x/xc/xcat/htdocs/aix/devel +# release snapshot + +scp *.rpm nott,xcat@web.sourceforge.net:/home/groups/x/xc/xcat/htdocs/aix/2.3/core-snap +scp core-aix-snap.tar.gz nott,xcat@web.sourceforge.net:/home/groups/x/xc/xcat/htdocs/aix/2.3 + + +# new release +scp core-aix-2.3.tar.gz nott,xcat@web.sourceforge.net:/home/frs/project/x/xc/xcat/xcat/2.3.x_AIX/ -# scp *.rpm nott,xcat@web.sourceforge.net:/home/groups/x/xc/xcat/htdocs/aix/devel/xcat-core -#scp core-aix-2.3.tar.gz nott,xcat@web.sourceforge.net:/home/groups/x/xc/xcat/htdocs/aix/devel # for dep-aix & mysql etc. #scp ./dep-aix-2.3-200909241259.tar.gz nott,xcat@web.sourceforge.net:/home/frs/project/x/xc/xcat/xcat-dep/2.x_AIX/ diff --git a/perl-xCAT/xCAT/InstUtils.pm b/perl-xCAT/xCAT/InstUtils.pm index 5540865c1..be89224fb 100644 --- a/perl-xCAT/xCAT/InstUtils.pm +++ b/perl-xCAT/xCAT/InstUtils.pm @@ -327,7 +327,7 @@ sub xcmd { command => [$xdcmd], node => \@snodes, - arg => ["-v", $cmd] + arg => ["-s", $cmd] }, $sub_req, $exitcode, @@ -346,7 +346,7 @@ sub xcmd { command => [$xdcmd], node => \@snodes, - arg => ["-v", $cmd] + arg => ["-s", $cmd] }, $sub_req, $exitcode, diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm index b83f34ac7..ec3e1f231 100644 --- a/xCAT-server/lib/xcat/plugins/updatenode.pm +++ b/xCAT-server/lib/xcat/plugins/updatenode.pm @@ -1412,7 +1412,14 @@ sub updateAIXsoftware $pkg_string .= " /mnt/RPMS/ppc/$pkg"; } - my $rcmd = qq~rpm $flags $pkg_string~; + my $rcmd; + if ($pkg_string =~ /xCAT/) { + # add temporary hack to handle problem installing + # xCAT rpms that start the xcatd daemon. + $rcmd = qq~rpm $flags $pkg_string; /opt/xcat/sbin/xcatstart -r~; + } else { + $rcmd = qq~rpm $flags $pkg_string~; + } if ($::VERBOSE) {