diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm index f02b2e20b..8e8218c4f 100644 --- a/xCAT-server/lib/xcat/plugins/aixinstall.pm +++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm @@ -3625,6 +3625,46 @@ sub mk_lpp_source "Could not run command \'$lpp_cmd\'. (rc = $::RUNCMD_RC)\n"; xCAT::MsgUtils->message("E", $rsp, $callback); return undef; + } + + # + # make sure we get the extra packages we need + # - openssh, ? + # + my $out; + my $outp; + my $ccmd; + + # try to find openssh and copy it to the new lpp_source loc + my $fcmd = "/usr/bin/find $::opt_s -print | /usr/bin/grep openssh.base"; + $outp = xCAT::Utils->runcmd("$fcmd", -1); + if ($::RUNCMD_RC != 0) + { + my $rsp; + push @{$rsp->{data}}, "Could not find openssh file sets in source location.\n"; + xCAT::MsgUtils->message("W", $rsp, $callback); + } + + chomp $outp; + my $dir = dirname($outp); + + $ccmd = "/usr/bin/cp $dir/openssh* $loc/installp/ppc 2>/dev/null"; + $out = xCAT::Utils->runcmd("$ccmd", -1); + if ($::RUNCMD_RC != 0) + { + my $rsp; + push @{$rsp->{data}}, "Could not copy openssh to $loc/installp/ppc.\n"; + xCAT::MsgUtils->message("W", $rsp, $callback); + } + + # run inutoc + my $icmd = "/usr/sbin/inutoc $loc/installp/ppc"; + $out = xCAT::Utils->runcmd("$icmd", -1); + if ($::RUNCMD_RC != 0) + { + my $rsp; + push @{$rsp->{data}}, "Could not run inutoc on $loc/installp/ppc.\n"; + xCAT::MsgUtils->message("E", $rsp, $callback); } } } @@ -3640,10 +3680,6 @@ sub mk_lpp_source return $lppsrcname; } - - - - #---------------------------------------------------------------------------- =head3 mk_spot @@ -4125,6 +4161,7 @@ sub mk_resolv_conf_file if ($::VERBOSE) { my $rsp; + push @{$rsp->{data}}, "Set domain $domain into $fullname"; xCAT::MsgUtils->message("I", $rsp, $callback); } @@ -4819,6 +4856,7 @@ sub mk_mksysb #---------------------------------------------------------------------------- + =head3 prermnimimage Preprocessing for the rmnimimage command.