add reset of BMC for x3755 M4 (8722) after the BMC has been configured

Signed-off-by: Arif Ali <mail@arif-ali.co.uk>

README

@@ -1,14 +1,4 @@
 xCAT - eXtreme Cloud Administration Toolkit
 
-xCAT is a toolkit for the deployment and administration of clusters.
-
-xCAT documentation is available at: http://xcat.sourceforge.net/
-
-xCAT is made available as open source software under the EPL license:
-http://www.opensource.org/licenses/eclipse-1.0.php
-
-
-
-
-
+xCAT 2.8.5.1 is for Intel Haswell support for IBM m5 server.
 

Version

@@ -1 +1 @@
-2.8.4
+2.8.5.1

build-ubunturepo

@@ -53,7 +53,7 @@ for i in $*; do
 done
 
 # Supported distributions
-dists="maverick natty oneiric precise saucy"
+dists="maverick natty oneiric precise saucy trusty"
 
 c_flag=            # xcat-core (trunk-delvel) path
 d_flag=            # xcat-dep (trunk) path

buildcore.sh

@@ -44,10 +44,11 @@ FRS=/home/frs/project/x/xc/xcat
 ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-OpenStack xCAT-SoftLayer xCAT-OpenStack-baremetal"
 ZVMBUILD="perl-xCAT xCAT-server xCAT-UI"
 ZVMLINK="xCAT-client xCAT xCATsn"
-# xCAT has PCM specific configuration - conserver-xcat, syslinux-xcat
+# xCAT and xCATsn have PCM specific configuration - conserver-xcat, syslinux-xcat
 # xCAT-server has PCM specific configuration - RESTAPI(perl-JSON) 
-PCMBUILD="xCAT xCAT-server"
-PCMLINK="perl-xCAT xCAT-client xCAT-buildkit xCAT-genesis-scripts-x86_64"
+# xCAT-client has PCM specific configuration - getxcatdocs(perl-JSON) 
+PCMBUILD="xCAT xCAT-server xCAT-client xCATsn"
+PCMLINK="perl-xCAT xCAT-buildkit xCAT-genesis-scripts-x86_64"
 # Note: for FSM, the FlexCAT rpm is built separately from gsa/git
 FSMBUILD="perl-xCAT xCAT-client xCAT-server"
 FSMLINK=""

makerpm

@@ -85,6 +85,7 @@ function makexcat {
 			cd `dirname $0`/$RPMNAME
 			tar --exclude .svn -czf $RPMROOT/SOURCES/license.tar.gz LICENSE.html
 			cp xcat.conf $RPMROOT/SOURCES
+			cp xcat.conf.apach24 $RPMROOT/SOURCES
 			cp xCATSN $RPMROOT/SOURCES
 			cd - >/dev/null
 		elif [ "$RPMNAME" = "xCAT-buildkit" ]; then

perl-xCAT/debian/rules

@@ -48,7 +48,7 @@ binary-arch: build install
 	chmod 644 `pwd`/debian/perl-xcat/opt/xcat/share/doc/man5/*
 	chmod 644 `pwd`/debian/perl-xcat/opt/xcat/share/man/man7/*
 	chmod 644 `pwd`/debian/perl-xcat/opt/xcat/share/doc/man7/*
-	./modifyUtils `cat ../Version` `svn info | grep Revision | cut -d" " -f 2`
+	./modifyUtils `cat ../Version` `git log -n 1 | head -n 1 | cut -f 2 -d ' '`
 #	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate

perl-xCAT/xCAT/CFMUtils.pm

@@ -500,6 +500,7 @@ sub setCFMPkglistFile {
     Arguments:
       $imagename - the specified linuximage name
       @curospkgs - the currently selected OS packages list
+      $mode      - using Fuzzy Matching or Exact Matching to check packages
     Returns:
       0 - update successfully
       1 - update failed
@@ -509,13 +510,22 @@ sub setCFMPkglistFile {
       none
     Example:
       my $ret = CAT::CFMUtils->updateCFMPkglistFile($imagename, @cur_selected_pkgs);
+      my $ret = CAT::CFMUtils->updateCFMPkglistFile($imagename, @cur_selected_pkgs, 1);
 
 =cut
 
 #-----------------------------------------------------------------------------
 sub updateCFMPkglistFile {
-    my ($class, $img, $ospkgs) = @_;
-     
+    my ($class, $img, $ospkgs, $mode) = @_;
+    
+    if(defined($mode)){
+        # Exact Matching
+        $mode = 1;
+    }else {
+        # Fuzzy Matching
+        $mode = 0;
+    }
+    
     my @cur_selected = @$ospkgs;
     my $cfmpkglist = "/install/osimages/$img/pkglist.cfm";
 
@@ -549,6 +559,14 @@ sub updateCFMPkglistFile {
         my @selected = @$selected_ref;
         @basepkgs = xCAT::CFMUtils->arrayops("U", \@basepkgs, \@selected);
     }
+    
+    # Fuzzy Matching
+    if (not $mode){
+        my ($ref1, $ref2, $ref3) = xCAT::CFMUtils->updateSelectedPkgs(\@pre_selected, \@pre_removed, \@cur_selected);
+        @pre_selected = @$ref1;
+        @pre_removed = @$ref2;
+        @cur_selected = @$ref3;
+    }
 
     # get diff between previous and current selected OS packages lists    
     my @diff = xCAT::CFMUtils->getPkgsDiff(\@pre_selected, \@cur_selected);
@@ -661,6 +679,48 @@ sub getPreOSpkgsList {
     return (\@selected, \@removed);
 }
 
+#-----------------------------------------------------------------------------
+
+=head3 getPreBaseOSpkgsList
+    Get previously selected and removed base OS packages lists from pkglist file. Packages named with "example.xxx" should be the base name "example"
+
+    Arguments:
+      $ospkglist - the path for ospkglist file
+    Returns:
+      refs for selected and removed OS packages arrays
+    Globals:
+      none
+    Error:
+      none
+    Example:
+      my $pre_selected_ref = xCAT::CFMUtils->getPreOSpkgsList($ospkglist);
+
+=cut
+
+#-----------------------------------------------------------------------------
+sub getPreBaseOSpkgsList {
+    my ($class, $pkglist) = @_;
+    
+    my ($pre_selected_ref, $pre_removed_ref) = xCAT::CFMUtils->getPreOSpkgsList($pkglist); 
+    
+    my %pre_selected_hash = ();
+    foreach (@$pre_selected_ref) {
+        my @names = split(/\./, $_);
+        my $basename = $names[0];
+        
+        if ($_ =~ /^$basename\.([^\.]+)$/) {
+            $pre_selected_hash{$basename} = 1;
+        }else {
+            $pre_selected_hash{$_} = 1;
+        }
+    }
+    
+    my @pre_selected = keys %pre_selected_hash;
+
+    return \@pre_selected;
+}
+
+
 #-----------------------------------------------------------------------------
 
 =head3 getPkgsDiff
@@ -819,3 +879,66 @@ sub arrayops {
 
     #return (\@union, \@intersection, \@difference);
 }
+
+
+#-----------------------------------------------------------------------------
+
+=head3 updateSelectedPkgs
+    Update previous selected, previous removed and current selected packages based on fuzzy matching rules. Packages named with "example.i686" should be same with package "example"
+
+    Arguments:
+      \@pre_selected - reference to previous selected packages
+      \@pre_removed - reference to previous removed packages
+      \@cur_selected - reference to current selected packages
+    Returns:
+      new previous selected, previous removed, current selected packages
+    Globals:
+      none
+    Error:
+      none
+    Example:
+      my ($ref1, $ref2, $ref3) = xCAT::CFMUtils->arrayops(\@pre_selected, \@pre_removed, \@cur_selected);
+
+=cut
+
+#-----------------------------------------------------------------------------
+sub updateSelectedPkgs() {
+    my ($class, $pre_selected_ref, $pre_removed_ref, $cur_selected_ref) = @_; 
+    
+    my %pre_selected_hash = map{$_ => 1} @$pre_selected_ref;
+    my %pre_removed_hash = map{$_ => 1} @$pre_removed_ref;
+    my %cur_selected_hash = map{$_ => 1} @$cur_selected_ref;
+    
+    my %new_pre_selected_hash = %pre_selected_hash;
+    my %new_pre_removed_hash = %pre_removed_hash;
+    my %new_cur_selected_hash = %cur_selected_hash;
+    
+    foreach (keys %cur_selected_hash) {
+        my $father = $_;
+        my $flag = 0;
+        foreach (keys %pre_selected_hash) {
+            my $child = $_;
+            if ($child =~ /^$father\.([^\.]+)$/) {
+                $new_cur_selected_hash{$child} = 1;
+                $flag = 1;
+            }
+        }
+        if ($flag and not exists $pre_selected_hash{$father}){
+            delete $new_cur_selected_hash{$father} if exists $new_cur_selected_hash{$father};
+        }
+        
+        foreach (keys %pre_removed_hash) {
+            my $child = $_;
+            if ($child =~ /^$father\.([^\.]+)$/) {
+                delete $new_pre_removed_hash{$child} if exists $new_pre_removed_hash{$child};
+            }
+        }
+    }
+    
+    my @new_cur_selected = keys %new_cur_selected_hash;
+    my @new_pre_selected = keys %new_pre_selected_hash;
+    my @new_pre_removed = keys %new_pre_removed_hash;
+    
+    
+    return (\@new_pre_selected, \@new_pre_removed, \@new_cur_selected);  
+}

perl-xCAT/xCAT/Client.pm

@@ -27,7 +27,7 @@ if ($inet6support) {
 
 if ($^O =~ /^linux/i) {
     # Is IPv6 enabled on the MN or xcat client node at all?
-    my $ipv6enabled = `ip addr | grep inet6`;
+    my $ipv6enabled = `ip addr 2> /dev/null | grep inet6`;
     if (!$ipv6enabled) {
         $inet6support = 0;
     }

perl-xCAT/xCAT/DSHCLI.pm

@@ -4036,7 +4036,7 @@ sub parse_and_run_dsh
         {    # from sinv, discard this name
             undef @$nodes;
         }
-        if (@$nodes)
+        if (@$nodes[0])
         {
             my $rsp = {};
             $rsp->{error}->[0] =
@@ -4407,6 +4407,14 @@ sub parse_and_run_dcp
             xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
             return;
         }
+        if (@$nodes[0])
+        {
+            my $rsp = {};
+            $rsp->{error}->[0] =
+              "Input noderange:@$nodes and any other xdsh flags or environment variables are not valid with -i flag.";
+            xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
+            return;
+        }
     }
     if ((!(defined($nodes))) && (!(defined($options{'rootimg'}))))
     {    #  no nodes and not -i option, error
@@ -4505,7 +4513,7 @@ sub parse_and_run_dcp
     #
     # build list of nodes
     my @nodelist;
-    if (@$nodes)
+    if (@$nodes[0])
     {    # there are nodes
         @nodelist = @$nodes;
         $options{'nodes'} = join(',', @nodelist);

perl-xCAT/xCAT/FSPvitals.pm

@@ -264,7 +264,7 @@ sub temp {
             # No frame commands for IVM 
             ################################# 
             if ( $hwtype eq "ivm" ) {
-                push @result, [$name,"$prefix Not available (No BPA)",1];
+                push @result, [$name,"$prefix Not available (No BPA)",0];
                 next;
             }
             ################################# 
@@ -272,14 +272,14 @@ sub temp {
             ################################# 
             if ( @$d[4] !~ /^(fsp|lpar|cec)$/ ) {
                 my $text = "$prefix Only available for CEC/LPAR";
-                push @result, [$name,$text,1];
+                push @result, [$name,$text,0];
                 next;
             }
             ################################# 
             # Error - No frame 
             #################################
             if ( $mtms eq "0" ) {
-                push @result, [$name,"$prefix Not available (No BPA)",1];
+                push @result, [$name,"$prefix Not available (No BPA)",0];
                 next;
             }
             #################################
@@ -352,7 +352,7 @@ sub rackenv {
             ################################# 
             if ( @$d[4] !~ /^(bpa|frame)$/ ) {
                 my $text = "$prefix Only available for BPA/Frame";
-                push @result, [$name,$text,1];
+                push @result, [$name,$text,0];
                 next;
             }
             

perl-xCAT/xCAT/FSPvm.pm

@@ -52,9 +52,10 @@ my @query_array = ();
 my %param_list_map = (
     'vmcpus' => 'part_get_lpar_processing',
     'vmmemory' => 'part_get_lpar_memory',
-    'vmphyslots' => 'part_get_all_io_bus_info',
-    'vmnics' => 'part_get_all_vio_info',
-    'vmstorage' => 'part_get_all_vio_info',
+    'add_physlots' => 'part_get_all_io_bus_info',
+    'del_physlots' => 'part_get_all_io_bus_info',
+    'add_vmnics' => 'part_get_all_vio_info',
+    'add_vmstorage' => 'part_get_all_vio_info',
     'del_vadapter' => 'part_get_all_vio_info'
 );
 
@@ -62,7 +63,7 @@ sub chvm_parse_extra_options {
 	my $args = shift;
 	my $opt = shift;
     # Partition used attributes #
-    my @support_ops = qw(vmcpus vmmemory vmphyslots vmothersetting vmstorage vmnics del_vadapter);
+    my @support_ops = qw(vmcpus vmmemory add_physlots vmothersetting add_vmstorage add_vmnics del_vadapter del_physlots);
 	if (ref($args) ne 'ARRAY') {
 		return "$args";
 	}	
@@ -94,7 +95,13 @@ sub chvm_parse_extra_options {
                 if ($value !~ /^\d+$/) {
                     return "Invalid param '$value', only one slot id can be specified";
                 }
-
+            } elsif ($cmd eq "del_physlots") {
+                my @tmp_array = split ",",$value;
+                foreach (@tmp_array) {
+                    unless (/(0x\w{8})/) {
+                        return "'$_' is invalid";
+                    }
+                }
             } elsif ($cmd eq "vmothersetting") {
                 if ($value =~ /hugepage:\s*(\d+)/i) {
                     $opt->{huge_page} = $1;
@@ -105,7 +112,7 @@ sub chvm_parse_extra_options {
                     $tmp_hash{'get_cec_bsr'} = 1;
                 }
                 next;
-            } elsif ($cmd eq "vmstorage") {
+            } elsif ($cmd eq "add_vmstorage") {
                 if (exists($opt->{vios})) {
                     if ($value !~ /\d+/) {
                         return "'$value' is invalid, must be numbers";
@@ -149,7 +156,7 @@ sub chvm_parse_extra_options {
                 } else {
                     return "'$value' is invalid";
                 }
-            } elsif ($cmd eq "vmphyslots") {
+            } elsif ($cmd eq "add_physlots") {
                 my @tmp_array = split ",",$value;
                 foreach (@tmp_array) {
                     unless (/(0x\w{8})/) {
@@ -163,7 +170,7 @@ sub chvm_parse_extra_options {
                         return "'$_' is invalid";
                     }
                 }
-            } elsif ($cmd eq "vmnics") {
+            } elsif ($cmd eq "add_vmnics") {
                 my @tmp_array = split ",", $value;
                 foreach (@tmp_array) {
                     unless (/^vlan\d+$/i) {
@@ -794,14 +801,27 @@ sub do_op_extra_cmds {
 	        if ($op eq "lparname") {
 		    $action = "set_lpar_name";
 	        } elsif ($op eq "huge_page") {
+                    my @td = @$d;
+                    @td[0] = 0;
+                    my $tmphash = &query_cec_info_actions($request, $name, \@td, 1, ["get_huge_page"]);
+                    if ($tmphash->{huge_page_avail}) {
+                        if ($param > $tmphash->{huge_page_avail}) {
+                            push @values, [$name, "No enough huge pages, only $tmphash->{huge_page_avail} pages available", 0];
+                            $param = $tmphash->{huge_page_avail};
+                        }
+                        $param = "1/$param/$param";
+                    } else {
+                        push @values, [$name, "No huge page available to configure", 0];
+                        next;
+                    }
 		    $action = "set_huge_page";
 	        } elsif ($op eq "vmcpus") {
                     $action = "part_set_lpar_pending_proc";
-                } elsif ($op eq "vmphyslots") {
+                } elsif ($op eq "add_physlots" or $op eq "del_physlots") {
                     $action = "set_io_slot_owner_uber";
                 } elsif ($op eq "del_vadapter") {
                     $action = "part_clear_vslot_config";
-                } elsif ($op eq "vmnics") {
+                } elsif ($op eq "add_vmnics") {
                     my @vlans = split /,/,$param;
                     foreach (@vlans) {
                         if (/vlan(\d+)/i) {
@@ -820,7 +840,7 @@ sub do_op_extra_cmds {
                         }
                     }
                     next;
-                } elsif ($op eq "vmstorage") {
+                } elsif ($op eq "add_vmstorage") {
                     foreach my $v_info (@$param) {
                         if ($v_info =~ /(\d+),([\w_-]*):(\d+)/) {
                             my $vios = &find_lpar_id($request, @$d[3], $2);
@@ -871,7 +891,11 @@ sub do_op_extra_cmds {
                     $memhash->{lpar_used_regions} = 0;
                     my $ret = &deal_with_avail_mem($request, $name, $d, $memhash);
                     if (ref($ret) eq "ARRAY") {
-                        return ([[@$ret]]);
+                        if (@$ret[2]) {
+                            return ([[@$ret]]);
+	                 } else {
+                            push @values, $ret;
+                        }
                     }
                     $param = $memhash->{memory};
                     $action = "part_set_lpar_pending_mem";
@@ -885,7 +909,11 @@ sub do_op_extra_cmds {
                 }
                 my $tmp_value = ($param eq '*') ? $name : $param;
                 xCAT::MsgUtils->verbose_message($request, "$request->{command} $action for node:$name, parm:$tmp_value."); 
-                my $value = xCAT::FSPUtils::fsp_api_action($request, $name, $d, $action, 0, $tmp_value);
+                my @tmpd = @$d;
+                if ($op eq "del_physlots") {
+                    @tmpd[0] = "-1";
+                }
+                my $value = xCAT::FSPUtils::fsp_api_action($request, $name, \@tmpd, $action, 0, $tmp_value);
                 if (@$value[1] && ((@$value[1] =~ /Error/i) && (@$value[2] ne '0'))) {
                     return ([[$name, @$value[1], '1']]) ;
                 } else {
@@ -1667,7 +1695,7 @@ sub xCATdB {
                 $profile,
                 $parent ); 
         
-        return( xCAT::PPCdb::add_ppc( $hwtype, [$values] )); 
+        return( xCAT::PPCdb::add_ppc( $hwtype, [$values],'','',"FSP" )); 
     }
     return undef;
 }
@@ -2049,9 +2077,12 @@ sub deal_with_avail_mem {
                 my $cur_mem_in_G = $lparhash->{hyp_avail_mem} * $lparhash->{mem_region_size} * 1.0 / 1024;
                 return([$name, "Parse reserverd regions failed, no enough memory, available:$cur_mem_in_G GB.", 1]);
             }           
-            if ($cur > $cur_avail) {
-                my $new_cur = $cur_avail;
-                $lparhash->{memory} = "$min/$new_cur/$max";
+            if (($cur_avail > 0) and ($cur > $cur_avail)) {
+                my $cur_avail_in_G = $cur_avail * $lparhash->{mem_region_size} * 1.0 / 1024;
+                $lparhash->{memory} = "$min/$cur_avail/$max";
+		 unless ($lparhash->{full_par}) {
+                     return([$name, "Available memory is less than required, allocate $cur_avail_in_G GB.", 0]);
+		 }
             }
         } else {
             return ([$name, "Failed to get hypervisor reserved memory regions.", 1]);
@@ -2089,6 +2120,7 @@ sub create_lpar {
     my $name = shift;
     my $d = shift;
     my $lparhash = shift;
+    my @ret = ();
     my $values;
     if (exists($request->{opt}->{vios})) {
         $values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_def_state", 0, 0x03);
@@ -2101,7 +2133,7 @@ sub create_lpar {
     $values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "set_lpar_name", 0, $name);
     if (@$values[2] ne 0) {
         &set_lpar_undefined($request, $name, $d);
-        return ([$name, @$values[1], @$values[0]]);
+        return ([[$name, @$values[1], @$values[0]]]);
     }
     xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_shared_pool_util_auth");
     xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_group_id");
@@ -2112,7 +2144,7 @@ sub create_lpar {
         #$values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "set_io_slot_owner", 0, join(",",@phy_io_array)); 
         if (@$values[2] ne 0) {
             &set_lpar_undefined($request, $name, $d);
-            return ([$name, @$values[1], @$values[2]]);
+            return ([[$name, @$values[1], @$values[2]]]);
         }
     }
     if (exists($lparhash->{nics})) {
@@ -2128,7 +2160,7 @@ sub create_lpar {
                 $values = xCAT::FSPUtils::fsp_api_action($request,$name, $d, "part_set_veth_slot_config",0,"0,$vlanid,$mac");
                 if (@$values[2] ne 0) {
                     &set_lpar_undefined($request, $name, $d);
-                    return ([$name, @$values[1], @$values[2]]);
+                    return ([[$name, @$values[1], @$values[2]]]);
                 }
             }
         }
@@ -2138,7 +2170,7 @@ sub create_lpar {
             $values = xCAT::FSPUtils::fsp_api_action($request,$name, $d, "part_set_vscsi_slot_config",0,$v_info);
             if (@$values[2] ne 0) {
                 &set_lpar_undefined($request, $name, $d);
-                return ([$name, @$values[1], @$values[2]]);
+                return ([[$name, @$values[1], @$values[2]]]);
             }
         }
     }
@@ -2169,19 +2201,23 @@ sub create_lpar {
     $values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_pending_proc", 0, $lparhash->{cpus});
     if (@$values[2] ne 0) {
         &set_lpar_undefined($request, $name, $d);
-        return ([$name, @$values[1], @$values[2]]);
+        return ([[$name, @$values[1], @$values[2]]]);
     }
     $values = &deal_with_avail_mem($request, $name, $d,$lparhash);
     if (ref($values) eq "ARRAY") {
-        &set_lpar_undefined($request, $name, $d);
-        return ([@$values]);
+        if (@$values[2]) {
+            &set_lpar_undefined($request, $name, $d);
+            return ([[@$values]]);
+	 } else {
+            push @ret, $values;
+        }
     }
 
     #print "======>memory:$lparhash->{memory}.\n";
     $values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_pending_mem", 0, $lparhash->{memory});
     if (@$values[2] ne 0) {
         &set_lpar_undefined($request, $name, $d);
-        return ([$name, @$values[1], @$values[2]]);
+        return ([[$name, @$values[1], @$values[2]]]);
     }
     
     xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_comp_modes"); 
@@ -2196,9 +2232,11 @@ sub create_lpar {
         $values = xCAT::FSPUtils::fsp_api_action($request, $name, $d, "part_set_lpar_def_state", 0, 0x02);
     }
     if (@$values[2] ne 0) {
-        return ([$name, @$values[1], @$values[2]]);
+        return ([[$name, @$values[1], @$values[2]]]);
     }
-    return ([$name, "Done", 0]);
+    push @ret, [$name, "Done", 0];
+    #return ([$name, "Done", 0]);
+    return \@ret;
 }
 
 sub mkspeclpar {
@@ -2221,11 +2259,12 @@ sub mkspeclpar {
                 push @result, [$name, "Node must be LPAR", 1];
                 last;
             }
-            if (!exists($memhash->{run})) {
+            #if (!exists($memhash->{run})) 
+            {
                 my @td = @$d;
                 @td[0] = 0;
                 $memhash = &query_cec_info_actions($request, $name, \@td, 1, ["part_get_hyp_process_and_mem","lpar_lhea_mac","part_get_all_io_bus_info"]);
-                $memhash->{run} = 1; 
+                #$memhash->{run} = 1; 
             }
             my $tmp_ent = $ent->{$name}->[0];
             if (exists($opt->{vmcpus})) {
@@ -2261,11 +2300,23 @@ sub mkspeclpar {
 	    if ($tmp_ent->{cpus} =~ /^(\d+)\/(\d+)\/(\d+)$/) {
                 unless ($1 <= $2 and $2 <= $3) {
                     return([[$name, "Parameter for 'vmcpus' is invalid", 1]]);
+	        } elsif ($memhash->{process_units_avail} eq '0') {
+                    push @result, [$name, "No process available", 1];
+                    next;
+                } elsif ($2 > $memhash->{process_units_avail}) {
+                    my $cur = $memhash->{process_units_avail};
+                    my $min = $1 > $cur ? $cur : $1;
+                    $tmp_ent->{cpus} = "$min/$cur/$3";
+                    push @result, [$name, "Available processor is less than required, allocate $cur processors.", 0];
                 }
             } else {
                 return([[$name, "Parameter for 'vmcpus' is invalid", 1]]);
             }
             if ($tmp_ent->{memory} =~ /^([\d|.]+)([G|M]?)\/([\d|.]+)([G|M]?)\/([\d|.]+)([G|M]?)$/i) {
+                if ($memhash->{hyp_avail_mem} eq '0') {
+                    push @result, [$name, "No memory available", 1];
+                    next;
+                }
                 my ($mmin, $mcur, $mmax);
                 if ($2 == "G" or $2 == '') {
                     $mmin = $1 * 1024;
@@ -2372,7 +2423,7 @@ sub mkspeclpar {
             $tmp_ent->{phy_hea} = $memhash->{phy_drc_group_port};
             $tmp_ent->{logic_drc_phydrc} = $memhash->{logic_drc_phydrc};
             $values = &create_lpar($request, $name, $d, $tmp_ent); 
-            push @result, $values;
+            push @result, @$values;
             #need to add update db here
             my $rethash = query_cec_info_actions($request, $name, $d, 1, ["part_get_lpar_processing","part_get_lpar_memory","part_get_all_vio_info","part_get_all_io_bus_info","get_huge_page","get_cec_bsr"]);
             $lpar_hash{$name} = $rethash;     
@@ -2415,15 +2466,17 @@ sub mkfulllpar {
             $lpar_param{memory} = "1/".$rethash->{hyp_avail_mem}."/".$rethash->{hyp_config_mem};
             $lpar_param{hyp_config_mem} = $rethash->{hyp_config_mem};
             $lpar_param{hyp_avail_mem} = $rethash->{hyp_avail_mem};
+            $lpar_param{mem_region_size} = $rethash->{mem_region_size};
             my @phy_io_array = keys(%{$rethash->{bus}});
             $lpar_param{physlots} = join(",", @phy_io_array);
             $lpar_param{huge_page} = "1/".$rethash->{huge_page_avail}."/".$rethash->{huge_page_avail};
             $lpar_param{bsr_num} = $rethash->{cec_bsr_avail};
             $lpar_param{phy_hea} = $rethash->{phy_drc_group_port};
             $lpar_param{logic_drc_phydrc} = $rethash->{logic_drc_phydrc}; 
+            $lpar_param{full_par} = 1;
             $values = &create_lpar($request, $name, $d, \%lpar_param);
             $rethash->{logic_drc_phydrc} = $lpar_param{logic_drc_phydrc};
-            push @result, $values;
+            push @result, @$values;
             $name = undef;
             $d = undef;
         }    

perl-xCAT/xCAT/InstUtils.pm

@@ -217,14 +217,23 @@ sub is_me
     #my ($b1, $b2, $b3, $b4) = split /\./, $nameIP;
 
     # get all the possible IPs for the node I'm running on
-    my $ifcmd = "ifconfig -a | grep 'inet'";
-    my $result = xCAT::Utils->runcmd($ifcmd, -1, 1);
+    # this is a common subroutine for both AIX and Linux,
+    # AIX does not have ip command
+    my $ipcmd;
+    if ( -f "/sbin/ip" )
+    {
+        $ipcmd = "ip addr | grep 'inet'";
+    }
+    else
+    {
+        $ipcmd = "ifconfig -a | grep 'inet'";
+    }
+    my $result = xCAT::Utils->runcmd($ipcmd, -1, 1);
     if ($::RUNCMD_RC != 0)
     {
-        my $rsp;
-        #	push @{$rsp->{data}}, "Could not run $ifcmd.\n";
-        #    xCAT::MsgUtils->message("E", $rsp, $callback);
-		$::VERBOSE = $verb;
+        my $str="Error running ipcmd";
+        xCAT::MsgUtils->message("S", $str);
+        $::VERBOSE = $verb;
         return 0;
     }
 
@@ -232,7 +241,6 @@ sub is_me
     {
         my ($inet, $myIP, $str) = split(" ", $int);
         chomp $myIP;
-        $myIP =~ s/addr://;
         $myIP =~ s/\/.*//; # ipv6 address 4000::99/64
         $myIP =~ s/\%.*//; # ipv6 address ::1%1/128
 

perl-xCAT/xCAT/LparNetbootExp.pm

@@ -1240,6 +1240,12 @@ sub  ping_server{
     $msg[3] = "Status: ping return code now on stack\n";
     $newstate[3] = 4;
 
+    # get the timeout for ping test
+    my $to4pt;
+    if ( $ENV{TIMEOUT4PINGTEST} =~ /^\d+$/ ) {
+        $to4pt = ",$ENV{TIMEOUT4PINGTEST}";
+    } 
+
     #IPv6
     if ( $server_ip =~ /:/ ) {
         #::1, calculate link local address
@@ -1249,9 +1255,9 @@ sub  ping_server{
         } else {
             $linklocal_ip = $client_ip;
         }
-        $cmd[3] = "ping $full_path_name:ipv6,$server_ip,$linklocal_ip,$gateway_ip\r";
+        $cmd[3] = "ping $full_path_name:ipv6,$server_ip,$linklocal_ip,$gateway_ip$to4pt\r";
     } else {
-        $cmd[3] = "ping $full_path_name:$server_ip,$client_ip,$gateway_ip\r";
+        $cmd[3] = "ping $full_path_name:$server_ip,$client_ip,$gateway_ip$to4pt\r";
     }
     $pattern[3] = ".*ping(.*)ok(.*)0 >(.*)";
 
@@ -2628,7 +2634,7 @@ sub lparnetbootexp
             sub {
                 $rc = 2;
                 $rconsole->clear_accum();
-                nc_msg($verbose, "Please make sure rcons $node works.\n");
+                nc_msg(1, "Please make sure rcons $node works.\n");
             }
         ],
     );

perl-xCAT/xCAT/NetworkUtils.pm

@@ -19,7 +19,7 @@ use File::Path;
 use Math::BigInt;
 use Socket;
 use xCAT::GlobalDef;
-use Data::Dumper;
+#use Data::Dumper;
 use strict;
 use warnings "all";
 my $socket6support = eval { require Socket6 };
@@ -643,16 +643,11 @@ sub get_nic_ip
 {
     my $nic;
     my %iphash;
-    my $cmd     = "ifconfig -a";
-    my $result  = `$cmd`;
     my $mode    = "MULTICAST";
+        my $payingattention=0;
+        my $interface;
+        my $keepcurrentiface;
 
-    #############################################
-    # Error running command
-    #############################################
-    if ( !$result ) {
-        return undef;
-    }
 
     if (xCAT::Utils->isAIX()) {
         ##############################################################
@@ -664,6 +659,14 @@ sub get_nic_ip
         # en1: ...
         #
         ##############################################################
+        my $cmd     = "ifconfig -a";
+        my $result  = `$cmd`;
+        #############################################
+        # Error running command
+        #############################################
+        if ( !$result ) {
+          return undef;
+        }
         my @adapter = split /(\w+\d+):\s+flags=/, $result;
         foreach ( @adapter ) {
             if ($_ =~ /^(en\d)/) {
@@ -683,44 +686,39 @@ sub get_nic_ip
             }
         }
     }
-    else {
-        ##############################################################
-        # Should look like this for Linux:
-        # eth0 Link encap:Ethernet  HWaddr 00:02:55:7B:06:30
-        #      inet addr:9.114.154.193  Bcast:9.114.154.223
-        #      inet6 addr: fe80::202:55ff:fe7b:630/64 Scope:Link
-        #      UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
-        #      RX packets:1280982 errors:0 dropped:0 overruns:0 frame:0
-        #      TX packets:3535776 errors:0 dropped:0 overruns:0 carrier:0
-        #      collisions:0 txqueuelen:1000
-        #      RX bytes:343489371 (327.5 MiB)  TX bytes:870969610 (830.6 MiB)
-        #      Base address:0x2600 Memory:fbfe0000-fc0000080
-        #
-        # eth1 ...
-        # Redhat7
-        #eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
-        # inet 10.1.0.178  netmask 255.255.0.0  broadcast 10.1.255.255
-        #
-        ##############################################################
-        my @adapter= split /\n{2,}/, $result;
-        foreach ( @adapter ) {
-            if ( !($_ =~ /LOOPBACK/ ) and
-                   $_ =~ /UP( |,|>)/ and 
-                   $_ =~ /$mode/ ) {
-                my @ip = split /\n/;
-                for my $ent ( @ip ) {
-                    if ($ent =~ /^(eth\d|ib\d|hf\d)\s+/) {
-                        $nic = $1;
-                    }   
-                    if ($ent =~ /^(eth\d:|ib\d:|hf\d:)\s+/) {
-                        $nic = $1;
-                    }   
-                    $ent=~ s/addr://;   # works for Redhat7 also
-                    if ( $ent =~ /^\s*inet \s*(\d+\.\d+\.\d+\.\d+)/ ) {
-                        $iphash{$nic} = $1; 
-                        next;
-                    }
+    else {   # linux
+        my @ipoutput = `ip addr`;
+        #############################################
+        # Error running command
+        #############################################
+        if ( !@ipoutput ) {
+          return undef;
+        }
+        foreach my $line (@ipoutput) {
+            if ($line =~ /^\d/) { # new interface, new context..
+                if ($interface and not $keepcurrentiface) {
+                    #don't bother reporting unusable nics
+                    delete $iphash{$interface};
                 }
+                $keepcurrentiface=0;
+                if ( !($line =~ /LOOPBACK/ ) and
+                   $line =~ /UP( |,|>)/ and 
+                   $line =~ /$mode/ ) {
+                
+                    $payingattention=1;
+                    $line =~ /^([^:]*): ([^:]*):/;
+                    $interface=$2;
+               } else {
+                    $payingattention=0;
+                    next;
+               }
+            }
+            unless ($payingattention) { next; } 
+            if ($line =~ /inet/) {
+                $keepcurrentiface=1;
+            }
+            if ( $line =~ /^\s*inet \s*(\d+\.\d+\.\d+\.\d+)/ ) {
+                 $iphash{$interface} = $1;
             }
         }
     }
@@ -1603,58 +1601,124 @@ sub thishostisnot
 =cut
 
 #-----------------------------------------------------------------------------
+#sub gethost_ips1
+#{
+#    my ($class) = @_;
+#    my $cmd;
+#    my @ipaddress;
+#    $cmd = "ifconfig" . " -a";
+#    $cmd = $cmd . "| grep \"inet\"";
+#    my @result = xCAT::Utils->runcmd($cmd, 0);
+#    if ($::RUNCMD_RC != 0)
+#    {
+#        xCAT::MsgUtils->message("S", "Error from $cmd\n");
+#        exit $::RUNCMD_RC;
+#    }
+#    foreach my $addr (@result)
+#    {
+#        my @ip;
+#        if (xCAT::Utils->isLinux())
+#        {
+#            if ($addr =~ /inet6/)
+#            {
+#               #TODO, Linux ipv6 
+#            }
+#            else
+#            {
+#                my ($inet, $addr1, $Bcast, $Mask) = split(" ", $addr);
+#                #@ip = split(":", $addr1);
+#                #push @ipaddress, $ip[1];
+#                $addr1 =~ s/.*://;
+#                push @ipaddress, $addr1;
+#            }
+#        }
+#        else
+#        {    #AIX
+#            if ($addr =~ /inet6/)
+#            {
+#               $addr =~ /\s*inet6\s+([\da-fA-F:]+).*\/(\d+)/;
+#               my $v6ip = $1;
+#               my $v6mask = $2;
+#               if ($v6ip)
+#               {
+#                   push @ipaddress, $v6ip;
+#               }
+#            }
+#            else
+#            {
+#                my ($inet, $addr1, $netmask, $mask1, $Bcast, $bcastaddr) =
+#                  split(" ", $addr);
+#                push @ipaddress, $addr1;
+#            }
+#
+#        }
+#    }
+#    my @names = @ipaddress;
+#    foreach my $ipaddr (@names)
+#    {
+#        my $hostname = xCAT::NetworkUtils->gethostname($ipaddr);
+#        if ($hostname)
+#        {
+#            my @shorthost = split(/\./, $hostname);
+#            push @ipaddress, $shorthost[0];
+#        }
+#    }
+#
+#    return @ipaddress;
+#}
+
+
 sub gethost_ips
 {
     my ($class) = @_;
     my $cmd;
     my @ipaddress;
-    $cmd = "ifconfig" . " -a";
-    $cmd = $cmd . "| grep \"inet\"";
-    my @result = xCAT::Utils->runcmd($cmd, 0);
-    if ($::RUNCMD_RC != 0)
+    if (xCAT::Utils->isLinux())
     {
-        xCAT::MsgUtils->message("S", "Error from $cmd\n");
-        exit $::RUNCMD_RC;
+       $cmd="ip -4 --oneline addr show |awk -F ' ' '{print \$4}'|awk -F '/' '{print \$1}'";
+       my @result =xCAT::Utils->runcmd($cmd);
+       if ($::RUNCMD_RC != 0)
+       {
+           xCAT::MsgUtils->message("S", "Error from $cmd\n");
+           exit $::RUNCMD_RC;
+       }   
+       
+       push @ipaddress, @result;
     }
-    foreach my $addr (@result)
-    {
-        my @ip;
-        if (xCAT::Utils->isLinux())
-        {
-            if ($addr =~ /inet6/)
-            {
-               #TODO, Linux ipv6 
-            }
-            else
-            {
-                my ($inet, $addr1, $Bcast, $Mask) = split(" ", $addr);
-                #@ip = split(":", $addr1);
-                #push @ipaddress, $ip[1];
-                $addr1 =~ s/.*://;
-                push @ipaddress, $addr1;
-            }
-        }
-        else
-        {    #AIX
-            if ($addr =~ /inet6/)
-            {
-               $addr =~ /\s*inet6\s+([\da-fA-F:]+).*\/(\d+)/;
-               my $v6ip = $1;
-               my $v6mask = $2;
-               if ($v6ip)
-               {
-                   push @ipaddress, $v6ip;
-               }
-            }
-            else
-            {
-                my ($inet, $addr1, $netmask, $mask1, $Bcast, $bcastaddr) =
-                  split(" ", $addr);
-                push @ipaddress, $addr1;
-            }
+    else
+    {    #AIX
+    
+       $cmd = "ifconfig" . " -a";
+       $cmd = $cmd . "| grep \"inet\"";
+       my @result = xCAT::Utils->runcmd($cmd, 0);
+       if ($::RUNCMD_RC != 0)
+       {
+           xCAT::MsgUtils->message("S", "Error from $cmd\n");
+           exit $::RUNCMD_RC;
+       }
+       
+       foreach my $addr (@result)
+       {
+          if ($addr =~ /inet6/)
+          {
+             $addr =~ /\s*inet6\s+([\da-fA-F:]+).*\/(\d+)/;
+             my $v6ip = $1;
+             my $v6mask = $2;
+             if ($v6ip)
+             {
+                 push @ipaddress, $v6ip;
+             }
+          }
+          else
+          {
+              my ($inet, $addr1, $netmask, $mask1, $Bcast, $bcastaddr) =
+                split(" ", $addr);
+              push @ipaddress, $addr1;
+          }
 
-        }
+       }
     }
+
     my @names = @ipaddress;
     foreach my $ipaddr (@names)
     {
@@ -1665,9 +1729,9 @@ sub gethost_ips
             push @ipaddress, $shorthost[0];
         }
     }
-
     return @ipaddress;
 }
+
 #-------------------------------------------------------------------------------
 
 =head3 get_subnet_aix 
@@ -1843,102 +1907,6 @@ sub validate_ip
     }
     return([0]);
 }
-
-#-------------------------------------------------------------------------------
-
-=head3   getFacingIP
-       Gets the ip address of the adapter of the localhost that is facing the
-    the given node.
-       Assume it is the same as my_ip_facing...
-    Arguments:
-       The name of the node that is facing the localhost.
-    Returns:
-       The ip address of the adapter that faces the node.
-
-=cut
-
-#-------------------------------------------------------------------------------
-sub getFacingIP
-{
-    my ($class, $node) = @_;
-    my $ip;
-    my $cmd;
-    my @ipaddress;
-
-    my $nodeip = inet_ntoa(inet_aton($node));
-    unless ($nodeip =~ /\d+\.\d+\.\d+\.\d+/)
-    {
-        return 0;    #Not supporting IPv6 here IPV6TODO
-    }
-
-    $cmd = "ifconfig" . " -a";
-    $cmd = $cmd . "| grep \"inet \"";
-    my @result = xCAT::Utils->runcmd($cmd, 0);
-    if ($::RUNCMD_RC != 0)
-    {
-        xCAT::MsgUtils->message("S", "Error from $cmd\n");
-        exit $::RUNCMD_RC;
-    }
-
-    # split node address
-    my ($n1, $n2, $n3, $n4) = split('\.', $nodeip);
-
-    foreach my $addr (@result)
-    {
-        my $ip;
-        my $mask;
-        if (xCAT::Utils->isLinux())
-        {
-            my ($inet, $addr1, $Bcast, $Mask) = split(" ", $addr);
-            if ((!$addr1) || (!$Mask)) { next; }
-            my @ips   = split(":", $addr1);
-            my @masks = split(":", $Mask);
-            $ip   = $ips[1];
-            $mask = $masks[1];
-        }
-        else
-        {    #AIX
-            my ($inet, $addr1, $netmask, $mask1, $Bcast, $bcastaddr) =
-              split(" ", $addr);
-            if ((!$addr1) && (!$mask1)) { next; }
-            $ip = $addr1;
-            $mask1 =~ s/0x//;
-            $mask =
-              `printf "%d.%d.%d.%d" \$(echo "$mask1" | sed 's/../0x& /g')`;
-        }
-
-        if ($ip && $mask)
-        {
-
-            # split interface IP
-            my ($h1, $h2, $h3, $h4) = split('\.', $ip);
-
-            # split mask
-            my ($m1, $m2, $m3, $m4) = split('\.', $mask);
-
-            # AND this interface IP with the netmask of the network
-            my $a1 = ((int $h1) & (int $m1));
-            my $a2 = ((int $h2) & (int $m2));
-            my $a3 = ((int $h3) & (int $m3));
-            my $a4 = ((int $h4) & (int $m4));
-
-            # AND node IP with the netmask of the network
-            my $b1 = ((int $n1) & (int $m1));
-            my $b2 = ((int $n2) & (int $m2));
-            my $b3 = ((int $n3) & (int $m3));
-            my $b4 = ((int $n4) & (int $m4));
-
-            if (($b1 == $a1) && ($b2 == $a2) && ($b3 == $a3) && ($b4 == $a4))
-            {
-                return $ip;
-            }
-        }
-    }
-
-    xCAT::MsgUtils->message("S", "Cannot find master for the node $node\n");
-    return 0;
-}
-
 #-------------------------------------------------------------------------------
 
 =head3    isIpaddr
@@ -1992,50 +1960,6 @@ sub isIpaddr
 }
 
 
-#-------------------------------------------------------------------------------
-=head3  getSubnetGateway 
-    Description:
-        Get gateway from the networks table of the specified net. 
-
-    Arguments:
-        net: the net, ie. the "net" field of the networks table
-    Returns:
-        Return a string, of the gateway
-        undef - Failed to get the gateway
-    Globals:
-        none
-    Error:
-        none
-    Example:
-        my $gateway = xCAT::NetworkUtils::getSubnetGateway('192.168.1.0');
-    Comments:
-        none
-
-=cut
-#-------------------------------------------------------------------------------
-sub getSubnetGateway
-{
-   my $netname=shift;
-   if( $netname =~ /xCAT::NetworkUtils/)
-   {
-      $netname=shift;
-   }
- 
-   my $gateway=undef;
-   my $nettab = xCAT::Table->new("networks");
-   unless($nettab) { die "No entry defined in networks"; }
-   my @nets = $nettab->getAllAttribs('net','gateway'); 
-   foreach(@nets)
-   {
-      if("$_->{net}" eq "$netname")
-      {
-         $gateway = $_->{gateway};
-         last;
-      }
-   }
-   
-   return $gateway; 
-} 
 
 
 #-------------------------------------------------------------------------------
@@ -2093,6 +2017,50 @@ sub getNodeNameservers{
     return \%nodenameservers;
 }
 
+#-------------------------------------------------------------------------------
+=head3  getNodeGateway 
+    Description:
+        Get gateway from the networks table of the node. 
+
+    Arguments:
+        ip: the ip address of the node
+    Returns:
+        Return a string, of the gateway
+        undef - Failed to get the gateway
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        my $gateway = xCAT::NetworkUtils::getNodeGateway('192.168.1.0');
+    Comments:
+        none
+
+=cut
+#-------------------------------------------------------------------------------
+sub getNodeGateway
+{
+   my $ip=shift;
+   if( $ip =~ /xCAT::NetworkUtils/)
+   {
+      $ip=shift;
+   }
+   my $gateway=undef;
+
+   my $nettab = xCAT::Table->new("networks");
+   if ($nettab) {
+      my @nets = $nettab->getAllAttribs('net','mask','gateway');
+      foreach my $net (@nets) {
+         if (xCAT::NetworkUtils::isInSameSubnet( $net->{'net'}, $ip, $net->{'mask'}, 0)) {
+               $gateway=$net->{'gateway'};
+            }
+        }
+    }
+
+
+   return $gateway;
+}
+
 #-------------------------------------------------------------------------------
 
 =head3   getNodeNetworkCfg 
@@ -2122,8 +2090,8 @@ sub getNodeNetworkCfg
     if( $node =~ /xCAT::NetworkUtils/)
     {
        $node =shift;
-    }  
- 
+    }
+
     my $nets = xCAT::NetworkUtils::my_nets();
     my $ip   = xCAT::NetworkUtils->getipaddr($node);
     my $mask = undef;
@@ -2132,12 +2100,14 @@ sub getNodeNetworkCfg
     {
         my $netname;
         ($netname,$mask) = split /\//, $net;
-        $gateway=xCAT::NetworkUtils::getSubnetGateway($netname);
         last if ( xCAT::NetworkUtils::isInSameSubnet( $netname, $ip, $mask, 1));
     }
+    $gateway=xCAT::NetworkUtils::getNodeGateway($ip);
     return ($ip, $node, $gateway, xCAT::NetworkUtils::formatNetmask($mask,1,0));
 }
 
+
+
 #-------------------------------------------------------------------------------
 
 =head3   get_hdwr_ip 

perl-xCAT/xCAT/PPCboot.pm

@@ -21,7 +21,6 @@ sub parse_args {
     my %opt     = ();
     my $cmd     = $request->{command};
     my $args    = $request->{arg};
-    my @VERSION = qw( 2.1 );
 
     #############################################
     # Responds with usage statement
@@ -60,7 +59,8 @@ sub parse_args {
     # Option -v for version
     ####################################
     if ( exists( $opt{v} )) {
-        return( \@VERSION );
+        my $version = xCAT::Utils->Version();
+        return ([$version]);
     }
 
     if ( exists( $opt{s} ) ){
@@ -350,6 +350,27 @@ sub do_rnetboot {
             last;
         }
     }
+
+    # Set the boot mode to norm from 'of' (open firmware)
+    # NOW, only necessary for IVM
+    my $hwtype = @$exp[2];
+    if ($hwtype eq "ivm") {
+        my $server = @$exp[3];
+
+        # creat connection first
+        my @newexp = xCAT::PPCcli::connect( $request, $hwtype, $server );
+        if (ref($newexp[0]) eq "Expect" ) {
+            my $cfg = "lpar_id=@$d[0],boot_mode=norm";
+            # change the boot mode to 'norm'
+            xCAT::PPCcli::chsyscfg(\@newexp, "prof", $d, $cfg);
+            xCAT::PPCcli::disconnect(\@newexp);
+        } else {
+            my $rsp;
+            $rsp->{data} = ["Failed to set the boot mode to normal. For rnetboot command, you have to rpower off and then on the node after finishing the OS deployment."];
+            xCAT::MsgUtils->message("E", $rsp, $request->{callback});
+        }
+    }
+
     return  $result;
 }
 

perl-xCAT/xCAT/PPCcfg.pm

@@ -436,9 +436,9 @@ sub sshcfg {
     #####################################
     # userid@host not found in key file
     #####################################
-    if ( $sshkey !~ /\s+(\S+\@\S+$)/ ) {
-        return( [[$server,"Cannot find userid\@host in '$fname'",RC_ERROR]] );
-    }
+    #if ( $sshkey !~ /\s+(\S+\@\S+$)/ ) {
+    #    return( [[$server,"Cannot find userid\@host in '$fname'",RC_ERROR]] );
+    #}
     my $logon = $1;
 
     #####################################

perl-xCAT/xCAT/PPCdb.pm

@@ -75,6 +75,7 @@ sub add_ppc {
     my $values   = shift;
     my $not_overwrite = shift;
     my $otherinterfaces = shift;
+    my $callfile = shift;
     my @tabs     = qw(ppc vpd nodehm nodelist nodetype hosts mac); 
     my %db       = ();
     ###################################
@@ -119,7 +120,12 @@ sub add_ppc {
         
         # Specify CEC and Frame's mgt as fsp and bpa
         if ( $type =~ /^cec$/)  {
-            $mgt = "fsp";
+            if ( $callfile eq "PPC" )  {
+                $mgt = "hmc";
+            }
+            if ( $callfile eq "FSP" )   {
+                $mgt = "fsp";
+            }
         }
         if ( $type =~ /^frame$/)  {
             $mgt = "bpa";
@@ -320,7 +326,7 @@ sub update_lpar {
             }
     }
     if (defined($write)) {
-        &add_ppc($hwtype, \@write_list);
+        &add_ppc($hwtype, \@write_list,'','',"FSP");
         return ([@update_list,@write_list]);
     } else {
         foreach ( @tabs ) {

perl-xCAT/xCAT/PPCenergy.pm

@@ -296,42 +296,37 @@ sub renergy {
 	    $deadnodes{$_}=1;
 	}	 
 	open (NMAP, "nmap -PE --system-dns --send-ip -sP ". join(' ',@hcps_ip) . " 2> /dev/null|") or die("Cannot open nmap pipe: $!");
-	my $node1;
-	my $msg1;
+	my $node;
 	while (<NMAP>) {
 	    #print "$_\n";
 	    if (/Host (.*) \((.*)\) appears to be up/) {
-		$node1=$2;
-		unless ($deadnodes{$node1}) {
+		$node=$2;
+		unless ($deadnodes{$node}) {
 		    foreach (keys %deadnodes) {
-			if ($node1 =~ /^$_\./) {
-			    $node1 = $_;
+			if ($node =~ /^$_\./) {
+			    $node = $_;
 			    last;
 			}
 		    }
 		}
-		delete $deadnodes{$node1};
+		delete $deadnodes{$node};
 		if ($verbose) {
 		    push @return_msg, [$node, $_, 0];
 		}
-		push(@pingable_hcp, $node1);
-	    } elsif (/Nmap scan report for ([^ ]*) \((.*)\)/) {
-		$node1=$2;
-		$msg1=$_;
+		push(@pingable_hcp, $node);
+	    } elsif (/Nmap scan report for ([^ ]*)/) {
+		$node=$1;
 	    } elsif (/Host is up./) {
-		unless ($deadnodes{$node1}) {
+		unless ($deadnodes{$node}) {
 		    foreach (keys %deadnodes) {
-			if ($node1 =~ /^$_\./) {
-			    $node1 = $_;
+			if ($node =~ /^$_\./) {
+			    $node = $_;
 			    last;
 			}
 		    }
 		}
-		delete $deadnodes{$node1};
-		if ($verbose) {
-		    push @return_msg, [$node, "$msg1$_", 0];
-		}
-		push(@pingable_hcp, $node1);
+		delete $deadnodes{$node};
+		push(@pingable_hcp, $node);
 	    }
 	}	
     } else {

perl-xCAT/xCAT/PPCfsp.pm

@@ -144,12 +144,16 @@ sub connect {
     ##################################
     # Set options
     ##################################
-    my $hosttab  = xCAT::Table->new( 'hosts' );
-    if ( $hosttab) {
-        my $hostshash = $hosttab->getNodeAttribs( $server, [qw(ip otherinterfaces)]);
-        if ( $hostshash ) {
-            $server = $hostshash->{ip};
-        }
+    #my $hosttab  = xCAT::Table->new( 'hosts' );
+    #if ( $hosttab) {
+    #    my $hostshash = $hosttab->getNodeAttribs( $server, [qw(ip otherinterfaces)]);
+    #    if ( $hostshash ) {
+    #        $server = $hostshash->{ip};
+    #    }
+    #}
+    $server = xCAT::NetworkUtils::getNodeIPaddress( $server );
+    unless ($server) {
+             return( "Unable to get IP address for $server" );
     }
 #    my $serverip = inet_ntoa(inet_aton($server));
     my $url = "https://$server/cgi-bin/cgi?form=2";

perl-xCAT/xCAT/PPCinv.pm

@@ -347,7 +347,7 @@ sub bus {
             #################################
             # Output header 
             #################################
-            push @result, [$name,"I/O Bus Information"];
+            push @result, [$name,"I/O Bus Information", 0];
 
             #################################
             # Output error 
@@ -532,7 +532,7 @@ sub config {
             #################################
             # Output header
             #################################
-            push @result, [$name,"Machine Configuration Info"];
+            push @result, [$name,"Machine Configuration Info", 0];
             my $i;
 
             foreach ( @prefix ) {

perl-xCAT/xCAT/PPCscan.pm

@@ -411,7 +411,7 @@ sub format_output {
         # Strip errors for results
         #######################################
         my @val = grep( !/^#.*: ERROR /, @$values );
-        xCAT::PPCdb::add_ppc( $hwtype, \@val );
+        xCAT::PPCdb::add_ppc( $hwtype, \@val,'','',"PPC" );
     }
 
     ###########################################

perl-xCAT/xCAT/PPCvitals.pm

@@ -203,7 +203,7 @@ sub voltage {
             # Voltages available in frame
             ################################# 
             if ( @$d[4] ne "bpa" ) {
-                push @result, [$name,"$text Only available for BPA",1];
+                push @result, [$name,"$text Only available for BPA",0];
                 next;
             }
             my $volt = enumerate_volt( $exp, $d );
@@ -256,7 +256,7 @@ sub temp {
             # No frame commands for IVM 
             ################################# 
             if ( $hwtype eq "ivm" ) {
-                push @result, [$name,"$prefix Not available (No BPA)",1];
+                push @result, [$name,"$prefix Not available (No BPA)",0];
                 next;
             }
             ################################# 
@@ -264,14 +264,14 @@ sub temp {
             ################################# 
             if ( @$d[4] !~ /^(fsp|cec|lpar)$/ ) {
                 my $text = "$prefix Only available for CEC/LPAR";
-                push @result, [$name,$text,1];
+                push @result, [$name,$text,0];
                 next;
             }
             ################################# 
             # Error - No frame 
             #################################
             if ( $mtms eq "0" ) {
-                push @result, [$name,"$prefix Not available (No BPA)",1];
+                push @result, [$name,"$prefix Not available (No BPA)",0];
                 next;
             }
             #################################

perl-xCAT/xCAT/PPCvm.pm

@@ -1913,7 +1913,7 @@ sub xCATdB {
                 $profile,
                 $parent ); 
         
-        return( xCAT::PPCdb::add_ppc( $hwtype, [$values] )); 
+        return( xCAT::PPCdb::add_ppc( $hwtype, [$values],'','',"PPC" )); 
     }
     return undef;
 }

perl-xCAT/xCAT/ProfiledNodeUtils.pm

@@ -655,6 +655,38 @@ sub get_all_cecs
 
 #-------------------------------------------------------------------------------
 
+=head3 get_all_lparids
+      Description : Get all LPAR ids  in system.
+      Arguments   : ref of all cecs
+      Returns     : ref for LPAR ids hash.
+      Example     : 
+                    my $arrayref = xCAT::ProfiledNodeUtils->get_all_lparids(\%allcecs);
+=cut
+
+#-------------------------------------------------------------------------------
+sub get_all_lparids
+{
+    my $class= shift;
+    my $cecsref = shift;
+    my %allcecs = %$cecsref;
+    my %lparids;
+
+    my $ppctab = xCAT::Table->new('ppc');
+    foreach my $cec (keys  %allcecs) {
+        my @ids = $ppctab->getAllAttribsWhere("hcp = '$cec'", 'id');
+        foreach (@ids) {
+            if ( $_->{'id'} ){
+                $lparids{$cec}{$_->{'id'}} = 0;
+            }
+        }
+    }
+    $ppctab->close();
+    
+    return \%lparids;
+}
+
+#-------------------------------------------------------------------------------
+
 =head3 is_discover_started
       Description : Judge whether profiled nodes discovering is running or not.
       Arguments   : NA
@@ -690,6 +722,7 @@ sub get_nodes_profiles
 {
     my $class = shift;
     my $nodelistref = shift;
+    my $groupnamemode = shift;
     my %profile_dict;
 
     my $nodelisttab = xCAT::Table->new('nodelist');
@@ -709,8 +742,12 @@ sub get_nodes_profiles
                 if ( $idx == 2 ){
                     # The group string will like @NetworkProfile_<profile name>
                     # So, index should +3, 2 for '__', 1 for _.
-                    my $append_index = length($profile) + 3;
-                    $profile_dict{$_}{$profile} = substr $group, $append_index;
+                    if ($groupnamemode) { 
+                        $profile_dict{$_}{$profile} = $group;
+                    } else{
+                        my $append_index = length($profile) + 3;
+                        $profile_dict{$_}{$profile} = substr $group, $append_index;
+                    }
                     last;
                 }
             }
@@ -739,7 +776,7 @@ sub get_imageprofile_prov_method
 
     my $nodetypestab = xCAT::Table->new('nodetype');
     my $entry = ($nodetypestab->getAllAttribsWhere("node = '$imgprofilename'", 'ALL' ))[0];
-    my $osimgname = $entry->{'provmethod'};
+    return $entry->{'provmethod'};
 
     #my $osimgtab = xCAT::Table->new('osimage');
     #my $osimgentry = ($osimgtab->getAllAttribsWhere("imagename = '$osimgname'", 'ALL' ))[0];
@@ -800,13 +837,10 @@ sub check_profile_consistent{
         }
     }
 
-    # Profile consistent keys, arch=>netboot,  mgt=>nictype
-    my %profile_dict = ('x86' => 'xnba','x86_64' => 'xnba', 'ppc64' => 'yaboot',
-                        'fsp' => 'FSP', 'ipmi' => 'BMC');
-                        
     # Get Imageprofile arch
     my $nodetypetab = xCAT::Table->new('nodetype');
-    my $nodetypeentry = $nodetypetab->getNodeAttribs($imageprofile, ['arch']);
+    my $nodetypeentry = $nodetypetab->getNodeAttribs($imageprofile, ['os','arch']);
+    my $os = $nodetypeentry->{'os'};
     my $arch = $nodetypeentry->{'arch'};
     $nodetypetab->close();
     
@@ -847,6 +881,13 @@ sub check_profile_consistent{
         return 0, "Provisioning network not defined for network profile."
     }
 
+    # Profile consistent keys, arch=>netboot,  mgt=>nictype
+    my $ppc_netboot = 'yaboot';
+    if( $os =~ /rhels7/ ){
+        $ppc_netboot = 'grub2';
+    }
+    my %profile_dict = ('x86' => 'xnba','x86_64' => 'xnba', 'ppc64' => $ppc_netboot,
+                        'fsp' => 'FSP', 'ipmi' => 'BMC');
     # Check if imageprofile is consistent with networkprofile
     if ($profile_dict{$arch} ne $netboot) {
         return 0, "Imageprofile's arch is not consistent with networkprofile's netboot."
@@ -860,6 +901,11 @@ sub check_profile_consistent{
             return 0, "$nictype networkprofile must use with hardwareprofile.";
         }
     }
+
+    if ($mgt eq 'vm') 
+    {
+        return 1, "";
+    }  
        
     # For nodetype is lpar node, not need to check the nictype as it is not required for lpar node
     if (not $nictype and $mgt and $nodetype ne 'lpar' ) { 
@@ -1139,3 +1185,70 @@ sub check_nicips{
     return (0, \%nics_hash, "");
 }
 
+#-------------------------------------------------------------------------------
+=head3 gen_chain_for_profiles
+    Description: Generate a chain string based on Network/Hardware/Image profiles.
+    Arguments: $profiles_hash: The reference for profiles hash.
+             For example: 
+             $profiles_hash = { 'HardwareProfile' => 'IBM_NeXtScale_M4',
+                                'ImageProfile' => 'rhels6.5-x86_64-stateful-compute',
+                                'NetworkProfile' => 'default_network_profile',
+                              }
+             $hw_reconfig: the flag shows whether we need re-configure all hardware
+                           relative settings or not: like runcmds, runimg...etc
+    Returns: ($retcode, $chain)
+              $retcode = 1. Generate chain failed, $chain stands for error message.
+              $retcode = 0. Generate chain OK. $chain stands for the chain string.
+
+=cut
+#-------------------------------------------------------------------------------
+sub gen_chain_for_profiles{
+    my $class = shift;
+    my $profiles_hashref = shift;
+    my $hw_reconfig = shift;
+    my $final_chain = "";
+    if (! $profiles_hashref){
+        return (1, "Missing parameter for gen_chain_for_profiles.");
+    }
+    # A node must have at least imageprofile and network profile.
+    unless (defined $profiles_hashref->{'ImageProfile'}){
+        return (1, "No imageprofile specified in profiles hash.");
+    }
+    unless (defined $profiles_hashref->{'NetworkProfile'}){
+        return (1, "No networkprofile specified in profiles hash.");
+    }
+    my $hwprofile = $profiles_hashref->{'HardwareProfile'};
+    my $imgprofile = $profiles_hashref->{'ImageProfile'};
+    my $netprofile = $profiles_hashref->{'NetworkProfile'};
+
+    # Get node's provisioning method
+    my $provmethod = xCAT::ProfiledNodeUtils->get_imageprofile_prov_method($imgprofile);
+    unless ($provmethod ){
+        return (1, "Can not get provisioning method for image profile $imgprofile");
+    }
+    my $netprofileattr = xCAT::ProfiledNodeUtils->get_nodes_nic_attrs([$netprofile])->{$netprofile};
+    unless ($netprofileattr){
+        return (1, "Can not get attributes for network profile $netprofile");
+    }
+
+    $final_chain = 'osimage='.$provmethod.":--noupdateinitrd";
+    # get the chain attribute from hardwareprofile and insert it to node.
+    if (defined $hwprofile and $hwprofile and $hw_reconfig){
+        my $chaintab = xCAT::Table->new('chain');
+        my $chain = $chaintab->getNodeAttribs($hwprofile, ['chain']);
+        if (exists $chain->{'chain'}) {
+               my $hw_chain = $chain->{'chain'};
+               $final_chain = $hw_chain.',osimage='.$provmethod.":--noupdateinitrd";
+        }
+    }
+    #run bmcsetups.
+    if ((exists $netprofileattr->{"bmc"}) and $hw_reconfig){ 
+        if (index($final_chain, "runcmd=bmcsetup") == -1){
+            $final_chain = 'runcmd=bmcsetup,'.$final_chain.':reboot4deploy';
+        }
+        else{
+            $final_chain = $final_chain.':reboot4deploy';
+        }
+    }
+    return (0, $final_chain);
+}

perl-xCAT/xCAT/RemoteShellExp.pm

@@ -810,6 +810,10 @@ sub senddeviceskeys
     # add to the command
     $setupcmd .=$key; 
     $setupcmd .="\"";
+    # Special case for vios
+    if ($ENV{DEVICETYPE} eq 'vios') {
+        $setupcmd = "\"echo $key | tee -a ~/.ssh/authorized_keys2\"";
+    }
     # For each input device
     my @nodelist=split(/,/,$nodes);
     foreach my $node (@nodelist) {

perl-xCAT/xCAT/SLP.pm

@@ -287,7 +287,7 @@ sub dodiscover {
                     if ($rethash{$peername}) {
                             next; #got a dupe, discard
                     }
-                    my $result = process_slp_packet(packet=>$slpkg,sockaddr=>$pkg,'socket'=>$args{'socket'});
+                    my $result = process_slp_packet(packet=>$slpkg,sockaddr=>$pkg,'socket'=>$args{'socket'}, peername=>$peername, callback=>$args{reqcallback});
                     if ($result) {
                         if ($peername =~ /\./) { #ipv4
                             $peername =~ s/::ffff://;
@@ -371,9 +371,10 @@ sub process_slp_packet {
         if ($parsedpacket->{FunctionId} == 2) {#Service Reply
             parse_service_reply($parsedpacket->{payload},$parsedpacket);
             unless (ref $parsedpacket->{service_urls} and scalar @{$parsedpacket->{service_urls}}) { return undef; }
-            if ($parsedpacket->{attributes}) { #service reply had ext
-
-                    return $parsedpacket; #don't bother sending attrrequest, already got it in first packet
+            if ($parsedpacket->{attributes} && get_mac_for_addr($args{peername})) {
+                #service reply had ext. Stop here if has gotten attributes and got mac. 
+                #continue the unicast request for service attributes if cannot find mac for peernode
+                return $parsedpacket; #don't bother sending attrrequest, already got it in first packet
             }
             my $srvtype = $xid_to_srvtype_map{$parsedpacket->{Xid}};
             my $packet = generate_attribute_request(%args,SrvType=>$srvtype);

perl-xCAT/xCAT/SPD.pm

@@ -650,7 +650,8 @@ sub decode_spd {
         8 => "DDR2 SDRAM",
         9 => "DDR2 SDRAM FB-DIMM",
         10 => "DDR2 SDRAM FB-DIMM PROBE",
-        11 => "DDR3 SDRAM"
+        11 => "DDR3 SDRAM",
+        12 => "DDR4 SDRAM",
     );
     
     my %modtypes = (
@@ -668,33 +669,35 @@ sub decode_spd {
         1333 => 10600,
         1600 => 12800,
         1867 => 14900,
+        2132 => 17000,
         2133 => 17000,
         2134 => 17000,
     );
 
-    my %ddr3modcap = (
+    my %ddrmodcap = (
         0 => 256,
         1 => 512,
         2 => 1024,
         3 => 2048,
         4 => 4096,
         5 => 8192,
-        6 => 16384
+        6 => 16384,
+        7 => 32768,
     );
 
-    my %ddr3devwidth = (
+    my %ddrdevwidth = (
         0 => 4,
         1 => 8,
         2 => 16,
         3 => 32
     );
-    my %ddr3ranks = (
+    my %ddrranks = (
         0 => 1,
         1 => 2,
         2 => 3,
         3 => 4
     );
-    my %ddr3buswidth = (
+    my %ddrbuswidth = (
         0 => 8,
         1 => 16,
         2 => 32,
@@ -728,10 +731,10 @@ sub decode_spd {
             $rethash->{product}->{name} .= " ECC";
         }
         $rethash->{product}->{name}.=" ".$modtypes{$spd[3]&0x0f};
-        my $sdramcap=$ddr3modcap{$spd[4]&0xf};
-        my $buswidth=$ddr3buswidth{$spd[8]&0b111};
-        my $sdramwidth=$ddr3devwidth{$spd[7]&0b111};
-        my $ranks = $ddr3ranks{($spd[7]&0b111000)>>3};
+        my $sdramcap=$ddrmodcap{$spd[4]&0xf};
+        my $buswidth=$ddrbuswidth{$spd[8]&0b111};
+        my $sdramwidth=$ddrdevwidth{$spd[7]&0b111};
+        my $ranks = $ddrranks{($spd[7]&0b111000)>>3};
 
 
         my $capacity = $sdramcap/8*$buswidth/$sdramwidth*$ranks;
@@ -769,6 +772,61 @@ sub decode_spd {
 	#	$rawspd .= sprintf("%02X ",$_);
 	#}
 	#push @{$rethash->{product}->{extra}},$rawspd;
+    } elsif  ($spd[2] == 12) { #DDR4 spec applies
+        # spd[125] spd[18] spd[18is sdram min cycle time .. spd125 is fine offset for min time
+        # mtb and ftb are fixed in ddr4 spd spec.. mtb is always 0.125 ns and ftb is always 0.001 ns
+        my $speed;
+        my $clock;
+        if ($spd[17] == 0) {
+            my $fineoffset = $spd[125];
+            if ($fineoffset & 0b10000000) {
+                #negative value, twos complement
+                $fineoffset = 0-(($fineoffset ^ 0xff) + 1);
+            }
+            $clock = int(2/((0.125*$spd[18] + $fineoffset*0.001)*0.001));
+            $speed = $speedfromclock{$clock};
+            unless ($speed) { $speed = "UNKNOWN"; }
+        } else { # this would mean a different MTB and FTB than spec indicated..
+            $clock = "UNKNOWN";
+            $speed = "UNKNOWN";
+        }
+        $rethash->{product}->{name}="PC4-".$speed." ($clock MT/s)";
+        if ($spd[13]&0b11000 == 0b1000) {
+            $rethash->{product}->{name} .= " ECC";
+        }
+        $rethash->{product}->{name}.=" ".$modtypes{$spd[3]&0x0f};
+        my $sdramcap=$ddrmodcap{$spd[4]&0xf};
+        my $buswidth=$ddrbuswidth{$spd[13]&0b111};
+        my $sdramwidth=$ddrdevwidth{$spd[12]&0b111};
+        my $ranks = $ddrranks{($spd[12]&0b111000)>>3};
+
+
+        my $capacity = $sdramcap/8*$buswidth/$sdramwidth*$ranks;
+        if ($capacity < 1024) {
+            $capacity = $capacity."MB";
+        } else {
+            $capacity = ($capacity/1024)."GB";
+        }
+        $rethash->{product}->{name} = $capacity." ".$rethash->{product}->{name};
+
+        $rethash->{product}->{manufacturer} = decode_manufacturer($spd[320],$spd[321]);
+        $rethash->{product}->{buildlocation} = sprintf("%02x",$spd[322]);
+        if ($spd[120] != 0 or $spd[121] != 0) {
+            $rethash->{product}->{builddate} = sprintf("Week %x of 20%02x",$spd[323],$spd[324]);
+        }
+        foreach (@spd[329..348]) {
+            if ($_ & 0b10000000) {
+                $rethash->{product}->{model}="Malformed SPD";
+            }
+        }
+        unless ($rethash->{product}->{model}) {
+            $rethash->{product}->{model}=pack("C*",@spd[329..348]);
+        }
+	#my $rawspd="SPD Dump: ";
+	#foreach (@spd) {
+	#	$rawspd .= sprintf("%02X ",$_);
+	#}
+	#push @{$rethash->{product}->{extra}},$rawspd;
     } else {
         $rethash->{product}->{model}="Unrecognized SPD";
     } 

perl-xCAT/xCAT/Schema.pm

@@ -389,7 +389,46 @@ ipmi => {
  descriptions => {
   node => 'The node name or group name.',
   bmc => 'The hostname of the BMC adapater.',
-  bmcport => 'In systems with selectable shared/dedicated ethernet ports, this parameter can be used to specify the preferred port.  0 means use the shared port, 1 means dedicated, blank is to not assign',
+  bmcport => ' In systems with selectable shared/dedicated ethernet ports,
+           this parameter can be used to specify the preferred port.  0
+           means use the shared port, 1 means dedicated, blank is to not
+           assign.
+
+           The following special cases exist for IBM System x servers:
+
+           For x3755 M3 systems, 0 means use the dedicated port, 1 means
+           shared, blank is to not assign.
+
+       For certain systems which have a mezzaine or ML2 adapter, there is a second
+       value to include:
+
+
+           For x3750 M4 (Model 8722):
+
+
+           0 2   1st 1Gbps interface for LOM
+
+           0 0   1st 10Gbps interface for LOM
+
+           0 3   2nd 1Gbps interface for LOM
+
+           0 1   2nd 10Gbps interface for LOM
+
+
+           For  x3750 M4 (Model 8752), x3850/3950 X6, dx360 M4, x3550 M4, and x3650 M4:
+
+
+           0     Shared (1st onboard interface)
+
+           1     Dedicated
+
+           2 0   First interface on ML2 or mezzanine adapter
+
+           2 1   Second interface on ML2 or mezzanine adapter
+
+           2 2   Third interface on ML2 or mezzanine adapter
+
+           2 3   Fourth interface on ML2 or mezzanine adapter',
   taggedvlan => 'Have bmcsetup place the BMC on the specified vlan tag on a shared netwirk interface.  Some network devices may be incompatible with this option',
   bmcid => 'Unique identified data used by discovery processes to distinguish known BMCs from unrecognized BMCs',
   username => 'The BMC userid.  If not specified, the key=ipmi row in the passwd table is used as the default.',
@@ -532,7 +571,7 @@ nodegroup => {
  },
   },
 nodehm => {
-    cols => [qw(node power mgt cons termserver termport conserver serialport serialspeed serialflow getmac cmdmapping comments disable)],
+    cols => [qw(node power mgt cons termserver termport conserver serialport serialspeed serialflow getmac cmdmapping consoleondemand comments disable)],
     keys => [qw(node)],
     tablespace =>'XCATTBS16K',
     table_desc => "Settings that control how each node's hardware is managed.  Typically, an additional table that is specific to the hardware type of the node contains additional info.  E.g. the ipmi, mp, and ppc tables.",
@@ -549,6 +588,7 @@ nodehm => {
   serialflow => "The flow control value of the serial port for this node.  For SOL this is typically 'hard'.",
   getmac => 'The method to use to get MAC address of the node with the getmac command. If not set, the mgt attribute will be used.  Valid values: same as values for mgmt attribute.',
   cmdmapping => 'The fully qualified name of the file that stores the mapping between PCM hardware management commands and xCAT/third-party hardware management commands for a particular type of hardware device.  Only used by PCM.',
+  consoleondemand => 'This overrides the value from site.consoleondemand; (0=no, 1=yes). Default is the result from site.consoleondemand.',
      comments => 'Any user-written notes.',
      disable => "Set to 'yes' or '1' to comment out this row.",
  },
@@ -708,7 +748,7 @@ linuximage  => {
  table_desc => 'Information about a Linux operating system image that can be used to deploy cluster nodes.',
  descriptions => {
   imagename => 'The name of this xCAT OS image definition.',
-  template => 'The fully qualified name of the template file that is used to create the kick start file for diskful installation.',
+  template => 'The fully qualified name of the template file that will be used to create the OS installer configuration file for stateful installations (e.g.  kickstart for RedHat, autoyast for SLES).',
   boottarget => 'The name of the boottarget definition.  When this attribute is set, xCAT will use the kernel, initrd and kernel params defined in the boottarget definition instead of the default.',
    addkcmdline=> 'User specified arguments to be passed to the kernel.  The user arguments are appended to xCAT.s default kernel arguments.   This attribute is ignored if linuximage.boottarget is set.',
   pkglist => 'The fully qualified name of the file that stores the distro  packages list that will be included in the image. Make sure that if the pkgs in the pkglist have dependency pkgs, the dependency pkgs should be found in one of the pkgdir',
@@ -727,7 +767,7 @@ linuximage  => {
   permission => 'The mount permission of /.statelite directory is used, its default value is 755',
   dump => qq{The NFS directory to hold the Linux kernel dump file (vmcore) when the node with this image crashes, its format is "nfs://<nfs_server_ip>/<kdump_path>". If you want to use the node's "xcatmaster" (its SN or MN), <nfs_server_ip> can be left blank. For example, "nfs:///<kdump_path>" means the NFS directory to hold the kernel dump file is on the node's SN, or MN if there's no SN.},
   crashkernelsize => 'the size that assigned to the kdump kernel. If the kernel size is not set, 256M will be the default value.',
-  partitionfile => 'The path of the configuration file which is used to part the disk for the node. For stateful: two types of value can be set for this attribute. One is "<partition file absolute path>", the content of the partition file must use the corresponding format with the OS type. The other one is "s:<partition file absolute path>", the content of the partition file should be a shell script which must write the partition definition into /tmp/partitionfile on the node. For statelite: the valid value is <partition file absolute path>, refer to the statelite doc for the xCAT defined format of the configuration file.',
+  partitionfile => 'The path of the configuration file which will be used to partition the disk for the node. For stateful osimages,two types of files are supported: "<partition file absolute path>" which contains a partitioning definition that will be inserted directly into the generated autoinst configuration file and must be formatted for the corresponding OS installer (e.g. kickstart for RedHat, autoyast for SLES).  "s:<partitioning script absolute path>" which specifies a shell script that will be run from the OS installer configuration file %pre section;  the script must write the correct partitioning definition into the file /tmp/partitionfile on the node which will be included into the configuration file during the install process. For statelite osimages, partitionfile should specify "<partition file absolute path>";  see the xCAT Statelite documentation for the xCAT defined format of this configuration file.',
   driverupdatesrc => 'The source of the drivers which need to be loaded during the boot. Two types of driver update source are supported: Driver update disk and Driver rpm package. The value for this attribute should be comma separated sources. Each source should be the format tab:full_path_of_srouce_file. The tab keyword can be: dud (for Driver update disk) and rpm (for driver rpm). If missing the tab, the rpm format is the default. e.g. dud:/install/dud/dd.img,rpm:/install/rpm/d.rpm',
   comments => 'Any user-written notes.',
   disable => "Set to 'yes' or '1' to comment out this row.",
@@ -742,7 +782,7 @@ winimage => {
   imagename => 'The name of this xCAT OS image definition.',
   template => 'The fully qualified name of the template file that is used to create the windows unattend.xml file for diskful installation.',
   installto => 'The disk and partition that the Windows will be deployed to. The valid format is <disk>:<partition>. If not set, default value is 0:1 for bios boot mode(legacy) and 0:3 for uefi boot mode; If setting to 1, it means 1:1 for bios boot and 1:3 for uefi boot',
-  partitionfile => 'The path of partition configuration file. Since the partition configuration for bios boot mode and uefi boot mode are different, this configuration file should include two parts if customer wants to support both bios and uefi mode. If customer just wants to support one of the modes, specify one of them anyway. Example of partition configuration file: [BIOS]xxxxxxx[UEFI]yyyyyyy. To simplify the setting, you also can set installto in partitionfile with section likes [INSTALLTO]0:1',
+  partitionfile => 'The path of partition configuration file. Since the partition configuration for bios boot mode and uefi boot mode are different, this configuration file can include both configurations if you need to support both bios and uefi mode. Either way, you must specify the boot mode in the configuration. Example of partition configuration file: [BIOS]xxxxxxx[UEFI]yyyyyyy. To simplify the setting, you also can set installto in partitionfile with section like [INSTALLTO]0:1',
   winpepath => 'The path of winpe which will be used to boot this image. If the real path is /tftpboot/winboot/winpe1/, the value for winpepath should be set to winboot/winpe1',
   comments => 'Any user-written notes.',
   disable => "Set to 'yes' or '1' to comment out this row.",
@@ -1116,9 +1156,9 @@ site => {
    "               locking out admin interactive use. This value works with the\n".
    "               xcatmaxconnections and xcatmaxbatch attributes. Is not supported on AIX.\n".
    "               If the value is no, nodes sleep for a random time before contacting\n".
-   "               xcatd, and retry. On a new install of xcat, this value will be set to yes.\n".
+   "               xcatd, and retry. The default is no.\n".
    "               See the following document for details:\n".
-   "               https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Hints_and_Tips_for_Large_Scale_Clusters\n\n".
+   "               Hints_and_Tips_for_Large_Scale_Clusters\n\n".
    " xcatmaxconnections:  Number of concurrent xCAT protocol requests before requests\n".
    "                      begin queueing. This applies to both client command requests\n".
    "                      and node requests, e.g. to get postscripts. Default is 64.\n\n".
@@ -1933,6 +1973,10 @@ my @nodeattrs = (
         {attr_name => 'serialflow',
                  tabentry => 'nodehm.serialflow',
                  access_tabentry => 'nodehm.node=attr:node',
+  },
+        {attr_name => 'consoleondemand',
+                 tabentry => 'nodehm.consoleondemand',
+                 access_tabentry => 'nodehm.node=attr:node',
   },
 ##################
 #  vpd table     #

perl-xCAT/xCAT/Usage.pm

@@ -18,8 +18,9 @@ use xCAT::Utils;
 my %usage = (
     "rnetboot" => 
 "Usage: rnetboot <noderange> [-s net|hd] [-F] [-f] [-V|--verbose] [-m table.colum==expectedstatus] [-m table.colum==expectedstatus...] [-r <retrycount>] [-t <timeout>]
-       rnetboot <noderange> [ipl= address]
-       rnetboot [-h|--help|-v|--version]",
+       rnetboot [-h|--help|-v|--version]
+     zVM specific:
+       rnetboot <noderange> [ipl= address]",
     "rpower" => 
 "Usage: rpower <noderange> [--nodeps] [on|onstandby|off|suspend|reset|stat|state|boot] [-V|--verbose] [-m table.colum==expectedstatus][-m table.colum==expectedstatus...] [-r <retrycount>] [-t <timeout>]
        rpower [-h|--help|-v|--version]
@@ -27,10 +28,12 @@ my %usage = (
        rpower <noderange> [boot] [ -c <path to iso> ]
      PPC (with IVM or HMC) specific:
        rpower <noderange> [--nodeps] [of] [-V|--verbose]
-     PPC (HMC) specific:
-       rpower <noderange> [onstandby] [-V|--verbose]
+     CEC (with HMC) specific:
+       rpower <noderange> [on|off|reset|boot|onstandby]
+     LPAR(with HMC) specific:
+       rpower <noderange> [on|off|reset|stat|state|boot|of|sms|softoff]
      CEC(using Direct FSP Management) specific:
-       rpower <noderange> [on|onstandby|off|stat|state|lowpower|resetsp]
+       rpower <noderange> [on|onstandby|off|stat|state|resetsp]
      Frame(using Direct FSP Management) specific:
        rpower <noderange> [stat|state|rackstandby|exit_rackstandby|resetsp]
      LPAR(using Direct FSP Management) specific:
@@ -131,7 +134,7 @@ my %usage = (
            textid=<*>|
            frame=<*>|
            ntp=<[ntp],[ip],[frequency],[v3]>
-   FSP/BPA Common:
+   FSP/CEC (using ASM Interface) Specific:
        rspconfig <noderange> [autopower|iocap|decfg|memdecfg|procdecfg|time|date|spdump|sysdump|network|hostname]
        rspconfig <noderange> autopower=<enable|disable>|
            iocap=<enable|disable>|
@@ -241,8 +244,10 @@ my %usage = (
        chvm <noderange> --p775 -i <id> [-m <memory_interleaving>] -r <partition_rule>
        chvm <noderange> [lparname=<*|name>]
        chvm <noderange> [vmcpus=min/req/max] [vmmemory=min/req/max]
-                        [vmphyslots=drc_index1,drc_index2...] [vmothersetting=hugepage:N,bsr:N]
-                        [vmnics=vlan1,vlan2] [vmstorage=<N|viosnode:slotid>] [--vios]
+                        [vmothersetting=hugepage:N,bsr:N]
+                        [add_physlots=drc_index1,drc_index2...] 
+                        [add_vmnics=vlan1,vlan2] [add_vmstorage=<N|viosnode:slotid>] [--vios]
+       chvm <noderange> [del_physlots=drc_index1,drc_index2...]
        chvm <noderange> [del_vadapter=slotid]
    VMware specific:
        chvm <noderange> [-a size][-d disk][-p disk][--resize disk=size][--cpus count][--mem memory]

perl-xCAT/xCAT/Utils.pm

@@ -1339,11 +1339,30 @@ sub runxcmd_output
                 }
             }
         }
+        if (defined($node->{error}))
+        {
+            if (ref(\($node->{error}->[0])) eq 'SCALAR')
+            {
+                $desc = $desc . ": " . $node->{error}->[0];
+            }
+        }
+        if (defined($node->{errorcode}))
+        { 
+            if (ref(\($node->{errorcode}->[0])) eq 'SCALAR')
+            {
+                $::RUNCMD_RC |=  $node->{errorcode}->[0];
+            }
+        }
         push @$::xcmd_outref, $desc;
     }
     if (defined($resp->{error}))
     {
-        push @$::xcmd_outref, @{$resp->{error}};
+        if (ref($resp->{error}) eq 'ARRAY')
+        { 
+          push @$::xcmd_outref, @{$resp->{error}};
+        } else {
+          push @$::xcmd_outref, $resp->{error};
+        }
     }
     if (defined($resp->{errorcode}))
     {
@@ -1829,8 +1848,7 @@ sub get_image_name
 #-------------------------------------------------------------------------------
 
 =head3   StartService
-	Supports AIX and Linux as long as the service is registered with
-	lssrc or startsrc.  
+	Supports AIX only, for Linux use startservice 
 	Used by the service node plugin (AAsn.pm) to start requested services. 
     Checks to see if the input service is already started. If it is started
 	it stops and  starts the service. Otherwise
@@ -1850,7 +1868,9 @@ sub get_image_name
     Example:
          if (xCAT::Utils->startService("named") { ...}
     Comments:
-        none
+         this subroutine is deprecated,
+         will be used as an internal function to process AIX service,
+         for linux, use xCAT::Utils->startservice instead
 
 =cut
 
@@ -2501,6 +2521,12 @@ sub check_deployment_monitoring_settings()
            ($attr, $val) = split /=~/,$m,2;
            $val =~ s/^\///;
            $val =~ s/\/$//;
+        } elsif ($m =~ /^[^=]*!=/) {
+           ($attr, $val) = split /!=/,$m,2;
+        } elsif ($m =~ /^[^=]*!~/) {
+           ($attr, $val) = split /!~/,$m,2;
+           $val =~ s/^\///;
+           $val =~ s/\/$//;
         } else {
            my $rsp={};
            $rsp->{data}->[0] = "Invalid string \"$m\" specified with -m flag";
@@ -3425,10 +3451,11 @@ sub version_cmp {
       string of the bin file name
     Returns:
       string of the full path name of the binary executable file
+      string of the bin file name in the argument if failed
     Globals:
         none
     Error:
-      string of the bin file name in the argument
+        none
     Example:
          my $CHKCONFIG = xCAT::Utils->fullpathbin("chkconfig");
     Comments:
@@ -3491,7 +3518,7 @@ sub gettimezone
   } else {   # all linux 
         my $localtime = "/etc/localtime";
         my $zoneinfo = "/usr/share/zoneinfo";
-        my $cmd = "find $zoneinfo -type f -exec cmp -s $localtime {} \\; -print | grep -v posix | grep -v SystemV";
+        my $cmd = "find $zoneinfo -xtype f -exec cmp -s $localtime {} \\; -print | grep -v posix | grep -v SystemV | grep -v right | grep -v localtime ";
         my $zone_result = xCAT::Utils->runcmd("$cmd", 0);
         if ($::RUNCMD_RC != 0)
         {
@@ -3515,5 +3542,667 @@ sub gettimezone
 
 }
 
+#--------------------------------------------------------------------------------
 
+=head3  specialservicemgr 
+    some special services cannot be processed in sysVinit, upstart and systemd framework, should be process here...
+    Arguments:
+      service name: 
+      action:        start/stop/restart/status/enable/disable
+      outputoption:  
+                     1:        return a hashref with the keys:"retcode","retmsg"
+                     otherwise: return retcode only
+    Returns:
+      
+                     a hashref if $outputoption is 1,the hash structure is:
+                                 {"retcode"=>(status code, 0 for running/active,1 for stopped/inactive,2 for failed)
+                                  "retmsg" =>(status string, running/active/stopped/inactive/failed)
+                                 }
+                     the status code otherwise
+
+                     retcode:   127 if the service specified is not processed
+                                the exit code of the service operation if the service specified is processed
+    
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        my $ret=xCAT::Utils->specialservicemgr("firewall","start");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub specialservicemgr{
+    my $svcname=shift;
+    my $action=shift;
+    my $outputoption=shift;
+    my %ret; 
+ 
+    $ret{retcode}=127;
+    if($svcname eq "firewall") 
+    {
+
+       my $cmd="type -P SuSEfirewall2 >/dev/null 2>&1";
+       xCAT::Utils->runcmd($cmd,-1);
+       if($::RUNCMD_RC)
+       {
+          $ret{retcode}=127;
+          if(defined $outputoption and $outputoption == 1){
+             return \%ret;
+          }else{
+             return $ret{retcode};
+          }
+       }else{
+          if(($action eq "start") || ($action eq "stop")) 
+          {
+             $cmd="SuSEfirewall2 $action";
+          }elsif($action eq "restart"){
+             $cmd="SuSEfirewall2 stop;SuSEfirewall2 start";
+          }elsif($action eq "disable"){
+             $cmd="SuSEfirewall2 off";
+          }elsif($action eq "enable"){
+             $cmd="SuSEfirewall2 on";
+          }elsif($action eq "status"){
+             $cmd="service SuSEfirewall2_setup status";
+          }else{
+            
+             $ret{retcode}=127;
+             if(defined $outputoption and $outputoption == 1){
+                return \%ret;
+             }else{
+                return $ret{retcode};
+             }
+          }
+      
+          $ret{retmsg}=xCAT::Utils->runcmd($cmd,-1);
+          $ret{retcode}= $::RUNCMD_RC;
+          if(defined $outputoption and $outputoption == 1){
+             return \%ret;
+          }else{
+             return $ret{retcode};
+          }
+       }
+
+    }
+
+    if(defined $outputoption and $outputoption == 1){
+       return \%ret;
+    }else{
+       return $ret{retcode};
+    }
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3   servicemap 
+    returns the name of service unit(for systemd) or service daemon(for SYSVinit). 
+    Arguments:
+      $svcname: the name of the service
+      $svcmgrtype: the service manager type:
+                   0: SYSVinit
+                   1: systemd
+                   2: upstart  
+    Returns:
+      the name of service unit or service daemon
+      undef on fail
+    Globals:
+        none
+    Error:
+      None 
+    Example:
+         my $svc = xCAT::Utils->servicemap($svcname,1);
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub servicemap{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+  }
+  
+  my $svcmgrtype=shift;
+
+
+  #hash structure: 
+  #"service name $svcname" =>{
+  #"service manager name(SYSVinit/systemd) $svcmgrtype" 
+  #=> ["list of possible service file names for the specified $svcname under the specified $svcmgrtype "]
+  # }
+  #
+  #
+  # if there are more than 1 possible service names for a service among 
+  # different os distributions and os releases, the service should be 
+  # specified in %svchash with structure 
+  # (general service name) => {list of possible service names}
+  #
+  my %svchash=(
+     "dhcp"  =>    ["dhcp3-server","dhcpd","isc-dhcp-server"],
+     "nfs"   =>    ["nfsserver","nfs-server","nfs","nfs-kernel-server"],
+     "named" =>    ["named","bind9"],
+     "syslog" =>   ["syslog","syslogd","rsyslog"],
+     "firewall" => ["iptables","firewalld","ufw"],
+     "http" =>     ["apache2","httpd"],
+     "ntpserver" =>["ntpd","ntp"],
+     "mysql" =>    ["mysqld","mysql"],
+  );
+
+  my $path=undef;
+  my $postfix="";
+  my $retdefault=$svcname;
+  if($svcmgrtype == 0){
+     $path="/etc/init.d/";
+  }elsif ($svcmgrtype == 1){
+     $path="/usr/lib/systemd/system/";
+     $postfix=".service";
+#     $retdefault=$svcname.".service";
+  }elsif ($svcmgrtype == 2){
+     $path="/etc/init/";
+     $postfix=".conf";
+  }
+
+  
+  my $ret=undef;
+  if($svchash{$svcname}){
+    foreach my $file (@{$svchash{$svcname}}){
+       if(-e $path.$file.$postfix ){
+             $ret=$file;
+             last;
+          }
+    }      
+  }else{
+    if(-e $path.$retdefault.$postfix){
+        $ret=$retdefault;
+    } 
+ }
+ 
+ return $ret;  
+
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3  startservice  
+    start a service
+    Arguments:
+      service name
+    Returns:
+      0 on success
+      nonzero otherwise
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        xCAT::Utils->startservice("nfs");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub startservice{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+  }
+
+  my $retval=0;
+  $retval=specialservicemgr($svcname,"start");
+  if($retval != 127)
+  {
+     return $retval;
+  }
+
+  my $cmd="";
+  #for Systemd
+  my $svcunit=undef;
+  #for sysVinit
+  my $svcd=undef;
+  #for upstart
+  my $svcjob=undef;
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  if($svcunit)
+  {
+      $cmd="systemctl start $svcunit";
+  }
+  elsif( $svcjob )
+  {
+      $cmd="initctl start $svcjob";
+  }
+  elsif( $svcd )
+  {
+      $cmd="service $svcd start";
+  }
+
+  #print "$cmd\n"; 
+  if( $cmd eq "" )
+  {
+     return -1;
+  }
+ 
+  #xCAT::Utils->runcmd($cmd, -1);   # do not use runcmd (backtics), must use system to not fork
+  system($cmd);
+  $::RUNCMD_RC=$?;
+  return $::RUNCMD_RC;
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3  stopservice  
+    stop a service
+    Arguments:
+      service name
+    Returns:
+      0 on success
+      nonzero otherwise
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        xCAT::Utils->stopservice("nfs");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub stopservice{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+  }
+
+
+  my $retval=0;
+  $retval=specialservicemgr($svcname,"stop");
+  if($retval != 127)
+  {
+     return $retval;
+  }
+
+
+
+  my $cmd="";
+  my $svcunit=undef;
+  my $svcd=undef;
+  my $svcjob=undef; 
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  if($svcunit)
+  {
+      $cmd="systemctl stop $svcunit";
+  }
+  elsif( $svcjob )
+  {
+      $cmd="initctl status $svcjob |grep stop; if [ \"\$?\" != \"0\"  ]; then initctl  stop $svcjob ; fi";
+  }
+  elsif( $svcd )
+  {
+      $cmd="service $svcd stop";
+  }
+
+
+  #print "$cmd\n"; 
+  if( $cmd eq "" )
+  {
+     return -1;
+  }
+ 
+  #xCAT::Utils->runcmd($cmd, -1);   # do not use runcmd (backtics), must use system to not fork
+  system($cmd);
+  $::RUNCMD_RC=$?;
+  return $::RUNCMD_RC;
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3  restartservice  
+    restart a service
+    Arguments:
+      service name
+    Returns:
+      0 on success
+      nonzero otherwise
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        xCAT::Utils->restartservice("nfs");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub restartservice{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+  }
+
+
+  my $retval=0;
+  $retval=specialservicemgr($svcname,"restart");
+  if($retval != 127)
+  {
+     return $retval;
+  }
+
+  my $cmd="";
+  my $svcunit=undef;
+  my $svcd=undef;
+  my $svcjob=undef; 
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  if($svcunit)
+  {
+      $cmd="systemctl restart $svcunit";
+  }
+  elsif( $svcd )
+  {
+      $cmd="service $svcd restart";
+  }
+  elsif( $svcjob )
+  {
+      $cmd="initctl status $svcjob |grep stop; if [ \"\$?\" != \"0\"  ]; then initctl restart $svcjob ; else initctl start $svcjob; fi";
+  }
+
+  #print "$cmd\n"; 
+  if( $cmd eq "" )
+  {
+     return -1;
+  }
+ 
+  xCAT::Utils->runcmd($cmd, -1);
+  return $::RUNCMD_RC;
+}
+
+#--------------------------------------------------------------------------------
+
+=head3   checkservicestatus 
+    returns theservice status. 
+    Arguments:
+      $svcname: the name of the service
+      $outputoption[optional]:
+                   the output option
+                   1: return a hashref with the keys:"retcode","retmsg"
+           otherwise: return retcode only
+    Returns:
+      undef on fail
+      a hashref if $outputoption is 1,the hash structure is:
+                  {"retcode"=>(status code, 0 for running/active,1 for stopped/inactive,2 for failed)
+                   "retmsg" =>(status string, running/active/stopped/inactive/failed)
+                  }
+      the status code otherwise
+
+    Globals:
+        none
+    Error:
+      None 
+    Example:
+         my $ret = xCAT::Utils-checkservicestatus($svcname,1);
+         my $retcode = xCAT::Utils-checkservicestatus($svcname);
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub checkservicestatus{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+  }
+
+  my $outputoption=shift;
+
+  my $retval;
+  $retval=specialservicemgr($svcname,"status",1);
+  if($retval->{retcode} != 127)
+  {
+     if(defined $outputoption and $outputoption == 1 ){
+        return $retval;
+     }elsif(exists $retval->{retcode}){
+        return $retval->{retcode};
+     }
+  }
+
+
+  my $cmd="";
+  my $svcunit=undef;
+  my $svcd=undef;
+  my $svcjob=undef;
+  my %ret;
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  my $output=undef;
+
+  if($svcunit)
+  {
+      #for systemd, parse the output since it is formatted
+      $cmd="systemctl show --property=ActiveState $svcunit|awk -F '=' '{print \$2}'";
+      $output=xCAT::Utils->runcmd($cmd, -1);
+      if($output =~ /^active$/i){
+         $ret{retcode}=0;
+      }elsif($output =~ /^failed$/i){
+         $ret{retcode}=2;
+       
+      }elsif($output =~ /^inactive$/i){
+         $ret{retcode}=1;
+      }
+  }
+  elsif ( $svcjob  )
+  {
+      #for upstart, parse the output 
+      $cmd="initctl status $svcjob";
+      $output=xCAT::Utils->runcmd($cmd, -1);
+      if($output =~ /waiting/i){
+         $ret{retcode}=2;
+      }elsif($output =~ /running/i){
+         $ret{retcode}=0;
+      }
+      
+  }
+  elsif( $svcd )
+  {
+      #for SYSVinit, check the return value since the "service" command output is confused
+      $cmd="service $svcd status";
+      $output=xCAT::Utils->runcmd($cmd, -1);
+      $ret{retcode}=$::RUNCMD_RC; 
+#      if($output =~ /stopped|not running/i){
+#        $ret{retcode}=1;
+#      }elsif($output =~ /running/i){
+#        $ret{retcode}=0;
+#      }
+  }
+  if($output)
+  {
+     $ret{retmsg}=$output;
+  }
+  
+
+  if(defined $outputoption and $outputoption == 1 ){
+     return \%ret;
+  }elsif(exists $ret{retcode}){
+     return $ret{retcode};
+  }
+
+   return undef;
+
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3  enableservice 
+   enable a service to start it on the system bootup
+    Arguments:
+      service name
+    Returns:
+      0 on success
+      nonzero otherwise
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        xCAT::Utils->enableservice("nfs");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub enableservice{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+
+  }
+
+  my $retval=0;
+  $retval=specialservicemgr($svcname,"enable");
+  if($retval != 127)
+  {
+     return $retval;
+  }
+
+
+
+  my $cmd="";
+  my $svcunit=undef;
+  my $svcd=undef;
+  my $svcjob=undef;
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  if($svcunit)
+  {
+      $cmd="systemctl enable $svcunit";
+  }
+  elsif($svcjob)
+  {
+      $cmd="update-rc.d $svcjob defaults";
+  
+  }
+  elsif( $svcd )
+  {
+      my $CHKCONFIG = xCAT::Utils->fullpathbin("chkconfig");
+      if($CHKCONFIG ne "chkconfig"){
+          $cmd="$CHKCONFIG $svcd on";
+      }else{
+        $CHKCONFIG = xCAT::Utils->fullpathbin("update-rc.d");
+        if($CHKCONFIG ne "update-rc.d"){
+            $cmd="$CHKCONFIG $svcd defaults";
+        }
+      }
+  }
+  if( $cmd eq "" )
+  {
+     return -1;
+  }
+
+  xCAT::Utils->runcmd($cmd, -1);
+  return $::RUNCMD_RC;
+}
+
+
+#--------------------------------------------------------------------------------
+
+=head3  disableservice  
+    disable a service to prevent it from starting on system bootup
+    Arguments:
+      service name
+    Returns:
+      0 on success
+      nonzero otherwise
+    Globals:
+        none
+    Error:
+        none
+    Example:
+        xCAT::Utils->disableservice("nfs");
+    Comments:
+        none
+=cut
+
+#--------------------------------------------------------------------------------
+sub disableservice{
+  my $svcname=shift;
+  if( $svcname =~ /xCAT::Utils/)
+  {
+     $svcname=shift;
+
+  }
+
+
+
+  my $retval=0;
+  $retval=specialservicemgr($svcname,"disable");
+  if($retval != 127)
+  {
+     return $retval;
+  }
+
+
+  my $cmd="";
+  my $svcunit=undef;
+  my $svcjob=undef;
+  my $svcd=undef;
+
+  $svcunit=servicemap($svcname,1);
+  $svcjob=servicemap($svcname,2);
+  $svcd=servicemap($svcname,0);
+  if($svcunit)
+  {
+      $cmd="systemctl disable $svcunit";
+  }
+  elsif($svcjob)
+  {
+      $cmd="update-rc.d -f $svcjob remove";
+    
+  }
+  elsif( $svcd )
+  {
+      my $CHKCONFIG = xCAT::Utils->fullpathbin("chkconfig");
+      if($CHKCONFIG ne "chkconfig"){
+          $cmd="$CHKCONFIG $svcd off";
+      }else{
+        $CHKCONFIG = xCAT::Utils->fullpathbin("update-rc.d");
+        if($CHKCONFIG ne "update-rc.d"){
+            $cmd="$CHKCONFIG -f $svcd remove";
+        }
+      }
+  }
+
+#  print "$cmd\n";
+  if( $cmd eq "" )
+  {
+     return -1;
+  }
+
+  xCAT::Utils->runcmd($cmd, -1);
+  return $::RUNCMD_RC;
+}
 1;

perl-xCAT/xCAT/data/discinfo.pm

@@ -18,6 +18,7 @@ require Exporter;
                  "1341569670.539525" => "centos6.3",#x86
                  "1362445555.957609" => "centos6.4",#x86_64
                  "1385726732.061157" => "centos6.5",#x86_64
+                 "1404489053.504589" => "centos7.0",
                  "1176234647.982657" => "centos5",
                  "1156364963.862322" => "centos4.4",
                  "1178480581.024704" => "centos4.5",
@@ -72,6 +73,7 @@ require Exporter;
 		 "1339640148.070971" => "rhelhpc6.3",#x86_64				
 		 "1359576195.413831" => "rhelhpc6.4",#x86_64, RHEL ComputeNode
 		 "1384196516.465862" => "rhelhpc6.5",#x86_64, RHEL ComputeNode
+		 "1399449226.140088" => "rhelhpc7.0",#x86_64, RHEL ComputeNode
                  "1194015916.783841" => "fedora8",
                  "1194015385.299901" => "fedora8",
                  "1210112435.291709" => "fedora9",
@@ -90,8 +92,9 @@ require Exporter;
                  "1194512327.501046" => "rhas4.6",
                  "1241464993.830723" => "rhas4.8", #x86-64
 
-		 "1273608367.051780" => "SL5.5", #x86_64 DVD ISO
-                "1299104542.844706" => "SL6", #x86_64 DVD ISO
+                 "1273608367.051780" => "SL5.5", #x86_64 DVD ISO
+                 "1299104542.844706" => "SL6", #x86_64 DVD ISO
+                 "1390839789.062069" => "SL6.5", #x86_64 DVD ISO Install
                 );
 my %numdiscs = (
                 "1156364963.862322" => 4,

xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_xlf15_xlc13.bnd

@@ -0,0 +1,10 @@
+# AIX Bundle file for compiler runtime packages
+
+I:xlC.aix61
+I:xlC.rte
+I:xlfrte
+I:xlfrte.aix61
+I:xlfrte.msg.en_US
+I:xlsmp.aix61.rte
+I:xlsmp.msg.en_US.rte
+I:xlsmp.rte

xCAT-IBMhpc/share/xcat/IBMhpc/ping-all/ping_all

@@ -62,7 +62,8 @@ else
    file=$1
 fi
 
-ifconfig -a  | grep 'inet ' | awk ' { print $2 } ' | grep -v 127.0.0.1 | 
+#ifconfig -a  | grep 'inet ' | awk ' { print $2 } ' | grep -v 127.0.0.1 | 
+ip -4 -oneline addr show 2>/dev/null |grep inet | sed -ne "s/.*inet //p"|awk -F ' ' '{print $1}'|awk -F '/' '{print $1}'|
 while read my_address ; do
     ##print "checking $my_address"
     grep -q " ${my_address}$" $file

xCAT-OpenStack-baremetal/debian/copyright

@@ -1,38 +1,88 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: xcat-openstack-baremetal
-Source: <url://example.com>
+Eclipse Public License - v 1.0
 
-Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
-Files: debian/*
-Copyright: 2014 root <root@unknown>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+1. DEFINITIONS
 
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
-# Please avoid to pick license terms that are more restrictive than the
-# packaged work, as it may make Debian's contributions unacceptable upstream.
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+ 

xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/config_ops_bm_node

@@ -100,8 +100,8 @@ change_host_name()
 
     if [ "$str_os_type" = "sles" ];then
         echo "Persistently changing the hostname not implemented yet."
-    #debian ubuntu
-    elif [ "$str_os_type" = "debian" ];then
+    #debian ubuntu and rh7
+    elif [ -f "/etc/hostname" ];then
         conf_file="/etc/hostname"
         echo "$str_hostname" > $conf_file
     else

xCAT-OpenStack-baremetal/share/xcat/openstack/postscripts/deconfig_ops_bm_node

@@ -36,8 +36,8 @@ change_host_name()
 
     if [ "$str_os_type" = "sles" ];then
         echo "Persistently changing the hostname not implemented yet."
-    #debian ubuntu
-    elif [ "$str_os_type" = "debian" ];then
+    #debian ubuntu and rh7
+    elif [ -f "/etc/hostname" ];then 
         conf_file="/etc/hostname"
         echo "$str_hostname" > $conf_file
     else

xCAT-OpenStack/xCAT-OpenStack.spec

@@ -92,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %ifos linux
   if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
     if [ -f $RPM_INSTALL_PREFIX0/sbin/xcatd  ]; then
-      /etc/init.d/xcatd reload
+      /etc/init.d/xcatd restart
     fi
   fi
 %endif

xCAT-SoftLayer/bin/getslnodes

@@ -38,11 +38,9 @@ if (scalar(@ARGV)>1) { $usage->(1); }
 my $hnmatch = $ARGV[0];		# if they specified a hostname match, only show svrs that start with that
 
 readconf("$ENV{HOME}/.slconfig");		# get the userid and api key from the config file
-#my $api_username = 'SL276540';
-#my $api_key = '799d5d9267a927a330ec016f00bfe17e6fc532d203cf68b3b0d997b2d27a3ce1';
 
 my $slinstalled = eval { push @INC, $CONFIG{apidir}; require SoftLayer::API::SOAP; };
-if (!$slinstalled) { die "Error: the SoftLayer::API::SOAP perl module is not installed. Download it using 'git clone https://github.com/softlayer/softlayer-api-perl-client' and put the directory in ~/.slconfig ."; }
+if (!$slinstalled) { die "$@\nError: either the SoftLayer::API::SOAP perl module is not installed, or some dependencies are missing.  Download it using 'git clone https://github.com/softlayer/softlayer-api-perl-client', put the directory in ~/.slconfig , and ensure its dependencies are installed."; }
 
 my $client = SoftLayer::API::SOAP->new('SoftLayer_Account', undef, $CONFIG{userid}, $CONFIG{apikey});
 
@@ -64,12 +62,23 @@ foreach my $server (@$servers) {
 		print "\tbmc=".$server->{remoteManagementComponent}->{ipmiIpAddress}."\n";
 		print "\tbmcusername=".$server->{remoteManagementAccounts}->[0]->{username}."\n";
 		print "\tbmcpassword=".$server->{remoteManagementAccounts}->[0]->{password}."\n";
-		print "\tmac=".$server->{backendNetworkComponents}->[0]->{macAddress}."\n";
-		print "\tip=".$server->{privateIpAddress}."\n";
+
+		# find the 1st active private nic that is not the bmc
+		foreach my $nic (@{$server->{backendNetworkComponents}}) {
+			#print "nic:\n"; foreach my $key (keys(%$nic)) { print "  $key = ", $nic->{$key}, "\n"; }
+			if ($nic->{status} eq 'ACTIVE' && $nic->{name} eq 'eth' && $nic->{macAddress} && $nic->{primaryIpAddress}) {
+				# found it
+				print "\tmac=".$nic->{macAddress}."\n";
+				print "\tip=".$nic->{primaryIpAddress}."\n";
+			}
+		}
+		#print "\tip=".$server->{privateIpAddress}."\n";	# getting this from the backendNetworkComponents instead
+		print "\tserial=".$server->{manufacturerSerialNumber}."\n";
 		print "\tnetboot=xnba\n";
 		print "\tarch=x86_64\n";
 		print "\tusercomment=hostname:".$server->{fullyQualifiedDomainName}.", user:".$server->{operatingSystem}->{passwords}->[0]->{username}.", pw:".$server->{operatingSystem}->{passwords}->[0]->{password}."\n";
 
+		verbose('SoftLayer API bare metal server entry: ' . Dumper($server));
 		#print Dumper($server->{remoteManagementAccounts});
 		#print "#Softlayer_account_info_for ".$server->{fullyQualifiedDomainName} . " Username: ";
 		#print $server->{operatingSystem}->{passwords}->[0]->{username} . " Password: ";

xCAT-SoftLayer/bin/khrem

@@ -0,0 +1,88 @@
+#!/usr/bin/perl
+
+# remove entries from the .ssh/known_hosts file for a node
+
+use strict;
+use Getopt::Long;
+use Data::Dumper;
+#$Data::Dumper::Maxdepth=2;
+
+# Globals - these are set once and then only read.
+my $HELP;
+my $VERBOSE;
+my $file = '~/.ssh/known_hosts';
+
+my $usage = sub {
+   	my $exitcode = shift @_;
+   	print "Usage: khrem <node>\n";
+    print "       Removes the entries in the .ssh/known_hosts file associated with this node.\n";
+	exit $exitcode;
+};
+
+# Process the cmd line args
+Getopt::Long::Configure("bundling");
+#Getopt::Long::Configure("pass_through");
+Getopt::Long::Configure("no_pass_through");
+if (!GetOptions('h|?|help'  => \$HELP, 'v|verbose' => \$VERBOSE)) { $usage->(1); }
+
+if ($HELP) { $usage->(0); }
+if (scalar(@ARGV)!=1) { $usage->(1); }
+my $node = $ARGV[0];		# if they specified a hostname match, only show svrs that start with that
+
+my @output = runcmd("host $node");
+my $hostname;
+my $line = shift @output;
+#print "line=$line\n";
+if ($line =~ m/is an alias for /) {
+    ($hostname) = $line =~ m/is an alias for ([^\.]+)/;
+    #print "hostname=$hostname\n";
+    $line = shift @output;
+  }
+#print "line=$line\n";
+my ($ip) = $line =~ m/has address (.+)$/;
+if (defined($hostname)) {
+    print "Removing entries from $file for: $node, $hostname, $ip\n";
+    runcmd("sed -i '/^$node/d;/^$hostname/d;/^$ip/d' $file");
+  }
+else {
+    print "Removing entries from $file for: $node, $ip\n";
+    runcmd("sed -i '/^$node/d;/^$ip/d' $file");
+}
+
+exit(0);
+
+
+# Pring msg only if -v was specified
+sub verbose { if ($VERBOSE) { print shift, "\n"; } }
+
+
+
+
+# Run a command.  If called in the context of return an array, it will capture the output
+# of the cmd and return it.  Otherwise, it will display the output to stdout.
+# If the cmd has a non-zero rc, this function will die with a msg.
+sub runcmd
+{
+    my ($cmd) = @_;
+    my $rc;
+
+    $cmd .= ' 2>&1' ;
+    verbose($cmd);
+
+   	my @output;
+   	if (wantarray) {
+		@output = `$cmd`;
+		$rc = $?;
+	}
+	else {
+		system($cmd);
+		$rc = $?;
+	}
+
+    if ($rc) {
+        $rc = $rc >> 8;
+        if ($rc > 0) { die "Error: rc $rc return from cmd: $cmd\n"; }
+        else { die "Error: system error returned from cmd: $cmd\n"; }
+    }
+    elsif (wantarray) { return @output; }
+}

xCAT-SoftLayer/bin/modifygrub

@@ -12,12 +12,14 @@ use Socket;
 # Globals - these are set once and then only read.
 my $HELP;
 my $VERBOSE;
+my $DRYRUN;
 my $WAITTIME;
+my $PROVMETHOD;
 my $XCATNETBOOTTITLE = 'xCAT network boot kernel and initrd';
 
 my $usage = sub {
    	my $exitcode = shift @_;
-   	print "Usage: modifygrub [-?|-h|--help] [-v|--verbose] [-w <waittime>] <kernel-path> <initrd-path> <kernel-parms> <mn-ip>\n\n";
+   	print "Usage: modifygrub [-?|-h|--help] [-v|--verbose] [--dryrun] [-w <waittime>] [-p <provmethod] <kernel-path> <initrd-path> <kernel-parms> <mn-ip>\n\n";
    	if (!$exitcode) {
    		print "Modify the grub config file on the node to boot the specified kernel and initrd.\n";
    	}
@@ -30,7 +32,7 @@ if (-f '/etc/os-release') { die "This script doesn't support ubuntu yet.\n"; }
 Getopt::Long::Configure("bundling");
 #Getopt::Long::Configure("pass_through");
 Getopt::Long::Configure("no_pass_through");
-if (!GetOptions('h|?|help'  => \$HELP, 'v|verbose' => \$VERBOSE, 'w|waittime=s' => \$WAITTIME)) { $usage->(1); }
+if (!GetOptions('h|?|help'  => \$HELP, 'v|verbose' => \$VERBOSE, 'dryrun' => \$DRYRUN, 'w|waittime=s' => \$WAITTIME, 'p|provmethod=s' => \$PROVMETHOD)) { $usage->(1); }
 
 if ($HELP) { $usage->(0); }
 if (scalar(@ARGV) != 4) { $usage->(1); }
@@ -58,41 +60,95 @@ sub addKernelParms {
 	# replace <nodename> with the nodename
 	my $nodename = $ENV{NODE};			# this env var is set by xdsh
 	$args->{kernelparms} =~ s/<nodename>/$nodename/g;
-
 	# get node ip and add it to the kernel parms
-	my ($nic, $ip, $netmask, $gateway) = getNodeIpInfo($args);
+	my ($nic, $ip, $netmask, $network, $broadcast, $gateway, $mac) = getNodeIpInfo($args);
 	if (!$ip) { die "Error: could not find the NIC that would connect to the xCAT mgmt node's IP (".$args->{mnip}.").\n"; }
-	$args->{kernelparms} .= " hostip=$ip netmask=$netmask gateway=$gateway dns=$mnip hostname=$nodename netdevice=$nic netwait=$WAITTIME textmode=1";
+	# if we are booting genesis, need to add the BOOTIF parm
+	my $bootif;
+	if ($args->{kernelpath} =~ m/genesis\.kernel\.x86_64/) {
+		$bootif = $mac;
+		$bootif =~ s/:/-/g;
+		$bootif = "BOOTIF=01-$bootif";
+	}
+
+	#todo: if you are running genesis shell (nodeset <node> shell), this if-else will depend on the nodeset done before that.
+	#		really should check for currstate=shell, or something like that
+	if (defined($PROVMETHOD) && $PROVMETHOD eq 'sysclone') {
+		# add additional parms for sysclone
+		# DEVICE=eth0 IPADDR=10.0.0.99 NETMASK=255.255.255.0 NETWORK=10.0.0.0 BROADCAST=10.0.0.255 GATEWAY=10.0.0.1 GATEWAYDEV=eth0
+		#todo:  should we also add ETHER_SLEEP=$WAITTIME textmode=1 dns=$mnip ?
+		$args->{kernelparms} .= " $bootif IPADDR=$ip NETMASK=$netmask NETWORK=$network BROADCAST=$broadcast GATEWAY=$gateway HOSTNAME=$nodename DEVICE=$nic GATEWAYDEV=$nic";
+	}
+	else {			# scripted install
+		#todo: the parameters for kickstart are likely different
+		$args->{kernelparms} .= " $bootif hostip=$ip netmask=$netmask gateway=$gateway dns=$mnip hostname=$nodename netdevice=$nic netwait=$WAITTIME textmode=1";
+              # print Dumper($args->{kernelparms})
+	}
 }
 
 
-# get this nodes nic, ip, netmask, and gateway.  Returns them in a 4 element array.
+# get this nodes nic, ip, netmask, gateway, and mac.  Returns them in a 5 element array.
 sub getNodeIpInfo {
 	my $args = shift @_;
-	my ($ipprefix) = $args->{mnip}=~m/^(\d+\.\d+)\./;		#todo: this is a hack, just using the 1st 2 octets of the mn ip addr
+	my ($ipprefix) = $args->{mnip}=~m/^(\d+)\./;		#todo: this is a hack, just using the 1st octet of the mn ip addr
 	verbose("using IP prefix $ipprefix");
 
-	# parse ip addr show output, looking for ipprefix, to determine nic and ip
-	my @output = runcmd("ip addr show");
-	my ($nic, $ipandmask);
+	# parse ip addr show output, looking for ipprefix, to determine nic, ip, mac
+	my @output = runcmd("/sbin/ip addr show");
+	my ($nic, $mac, $ipandmask);
 	foreach my $line (@output) {
-		my ($nictmp, $iptmp);
+		my ($nictmp, $mactmp, $iptmp);
 		if (($nictmp) = $line=~m/^\d+:\s+(\S+): /) { $nic = $nictmp; }		# new stanza, remember it
+		if (($mactmp) = $line=~m|^\s+link/ether\s+(\S+) |) { $mac = $mactmp; }		# got mac, remember it
 		if (($iptmp) = $line=~m/^\s+inet\s+($ipprefix\S+) /) { $ipandmask = $iptmp; last; }		# got ip, we are done
 	}
-	my ($ip, $netmask) = convertIpAndMask($ipandmask);
+	if (!defined($ipandmask)) { die "Error: can't find a NIC with a prefix $ipprefix that communicates with".$args->{mnip}.".\n"; }
+	my ($ip, $netmask, $network, $broadcast) = convertIpAndMask($ipandmask);
 
-	# if the nic is a bonded nic (common on sl), then find the 1st real nic that is part of it
-	my $realnic = $nic;
+	# if the nic is a bonded nic (common on sl), then find the 1st real nic that is up that is part of it.
+	# also find that real nics real mac
+	my $realnic;
 	if ($nic =~ /^bond/) {
 		my @nics = grep(m/\s+master\s+$nic\s+/, @output);
 		if (!scalar(@nics)) { die "Error: can't find the NICs that are part of $nic.\n"; }
-		($realnic) = $nics[0]=~m/^\d+:\s+(\S+): /;
+		foreach my $line (@nics) {
+			my ($nictmp, $state) = $line=~m/^\d+:\s+(\S+): .* state\s+(\S+)/;
+			if (defined($nictmp) && defined($state) && $state eq 'UP') { $realnic = $nictmp; last; }		# got ip, we are done
+		}
+		if (!defined($realnic)) { die "Error: can't find a physical NIC that is up and part of $nic.\n"; }
+
+		# now get the real mac of this real nic (when 2 nics are bonded, ip addr show displays one of the nics
+		# macs for both nics and the bond).  So we have to depend on /proc/net/bonding/$bond instead.
+		my @bondout = runcmd("cat /proc/net/bonding/$nic");
+		my $foundnic;
+		foreach my $line (@bondout) {
+			my $mactmp;
+			if ($line=~m/^Slave Interface:\s+$realnic/) { $foundnic = 1; }		# found the stanza for this nic, remember it
+			if ($foundnic && (($mactmp) = $line=~m/^Permanent HW addr:\s+(\S+)/)) { $mac = $mactmp; last; }
+		}
 	}
+	else { $realnic = $nic; }
+
+	# centos/redhat seems to name the nic in a different order than sles on some svrs.
+	# sles seems to name them in the same order as 'ip addr show' displays them, centos does not.
+	# so if we are on centos right now, we need to count down to determine the number that sles
+	# will give the nic that we have selected, because it is the sles naming that we care about,
+	# because that is the initrd that will be running in the scripted install case.
+	# For the sysclone case, genesis doxcat should be changed to use the mac to find the nic.
+	if (isRedhat()) {
+		my @nics = grep(m/^\d+:\s+eth/, @output);
+		my $i = 0;
+		foreach my $line (@nics) {
+			my ($nictmp) = $line=~m/^\d+:\s+(\S+):/;
+			if (defined($nictmp) && $nictmp eq $realnic) { $realnic = "eth$i"; last; }		# got ip, we are done
+			$i++;
+		}
+	}
+	print "Determined that SLES will call the install NIC $realnic (it has mac $mac)\n";
 
 	# finally, find the gateway
 	my $gateway;
-	my @output = runcmd("ip route");
+	my @output = runcmd("/sbin/ip route");
 	# we are looking for a line like: 10.0.0.0/8 via 10.54.51.1 dev bond0
 	my @networks = grep(m/ via .* $nic\s*$/, @output);
 	if (scalar(@networks)) { ($gateway) = $networks[0]=~m/ via\s+(\S+)/; }
@@ -102,19 +158,37 @@ sub getNodeIpInfo {
 		verbose("using xCAT mgmt node IP as the fall back gateway.");
 	}
 
-	verbose("IP info: realnic=$realnic, ip=$ip, netmask=$netmask, gateway=$gateway");
-	return ($realnic, $ip, $netmask, $gateway);
+	verbose("IP info: realnic=$realnic, ip=$ip, netmask=$netmask, gateway=$gateway, mac=$mac");
+	return ($realnic, $ip, $netmask, $network, $broadcast, $gateway, $mac);
 }
 
 
-# Convert an ip/mask in slash notation (like 10.0.0.1/26) to separate ip and netmask like 10.0.0.1 and 255.255.255.192
+# Convert an ip/mask in slash notation (like 10.1.1.1/26) to separate ip, netmask, network, and broadcast values,
+# like: 10.1.1.1, 255.255.255.192, 10.1.1.0, 10.1.1.63
 sub convertIpAndMask {
 	my $ipandmask = shift @_;
 	my ($ip, $masknum) = split('/', $ipandmask);
-	my $netbin = oct("0b" . '1' x $masknum . '0' x (32-$masknum));	# create a str like '1111100', then convert to binary
-	my @netarr=unpack('C4',pack('N',$netbin));		# separate into the 4 octets
-	my $netmask=join('.',@netarr);			# put them together into the normal looking netmask
-	return ($ip, $netmask);
+
+	# build the netmask
+	my $nmbin = oct("0b" . '1' x $masknum . '0' x (32-$masknum));	# create a str like '1111100', then convert to binary
+	my @nmarr=unpack('C4',pack('N',$nmbin));		# separate into the 4 octets
+	my $netmask=join('.',@nmarr);			# put them together into the normal looking netmask
+
+	# create binary form of ip
+	my @iparr=split(/\./,$ip);
+	my ( $ipbin ) = unpack('N', pack('C4',@iparr ) );
+
+	# Calculate network address by logical AND operation of ip & netmask and convert network address to IP address format
+	my $netbin = ( $ipbin & $nmbin );
+	my @netarr=unpack('C4', pack('N',$netbin ) );
+	my $network=join(".",@netarr);
+
+	# Calculate broadcast address by inverting the netmask and adding it to the network address
+	my $bcbin = ( $ipbin & $nmbin ) + ( ~ $nmbin );
+	my @bcarr=unpack('C4', pack('N',$bcbin ) ) ;
+	my $broadcast=join(".",@bcarr);
+
+	return ($ip, $netmask, $network, $broadcast);
 }
 
 
@@ -155,6 +229,11 @@ sub updateGrub {
 		"\tkernel " . $fileprefix . $args->{kernelpath} . ' ' . $args->{kernelparms} . "\n",
 		"\tinitrd " . $fileprefix . $args->{initrdpath} . "\n",
 		);
+	if ($DRYRUN) {
+		print "Dry run:  would add this stanza to $grubfile:\n";
+		foreach my $l (@entry) { print $l; }
+		return;
+	}
 
 	my $needtowritefile = 1;
 	if (grep(/^title\s+$XCATNETBOOTTITLE/, @lines)) { $needtowritefile = updateGrubEntry(\@lines, \@entry); }		# there is already an entry in there

xCAT-SoftLayer/bin/pushinitrd

@@ -13,12 +13,13 @@ use Data::Dumper;
 # Globals - these are set once and then only read.
 my $HELP;
 my $VERBOSE;
+my $DRYRUN;
 my $WAITTIME;
 my $NOAUTOINST;
 
 my $usage = sub {
    	my $exitcode = shift @_;
-   	print "Usage: pushinitrd [-?|-h|--help] [-v|--verbose] [-w <waittime>] <noderange>\n\n";
+   	print "Usage: pushinitrd [-?|-h|--help] [-v|--verbose] [--dryrun] [-w <waittime>] <noderange>\n\n";
    	if (!$exitcode) {
    		print "Copy the initrd, kernel, params, and static IP info to nodes, so they can net install\n";
 		print "even across vlans (w/o setting up pxe/dhcp broadcast relay).  This assumes a working\n";
@@ -32,7 +33,7 @@ my $usage = sub {
 Getopt::Long::Configure("bundling");
 #Getopt::Long::Configure("pass_through");
 Getopt::Long::Configure("no_pass_through");
-if (!GetOptions('h|?|help'  => \$HELP, 'v|verbose' => \$VERBOSE, 'w|waittime=s' => \$WAITTIME, 'a|noautoinst' => \$NOAUTOINST)) { $usage->(1); }
+if (!GetOptions('h|?|help'  => \$HELP, 'v|verbose' => \$VERBOSE, 'dryrun' => \$DRYRUN, 'w|waittime=s' => \$WAITTIME, 'a|noautoinst' => \$NOAUTOINST)) { $usage->(1); }
 
 if ($HELP) { $usage->(0); }
 if (scalar(@ARGV) != 1) { $usage->(1); }
@@ -45,32 +46,45 @@ copyFilesToNodes($noderange, \%bootparms);
 
 updateGrubOnNodes($noderange, \%bootparms);
 
-if (!$NOAUTOINST) { modifyAutoinstFiles($noderange, \%bootparms); }
+if ($DRYRUN) { exit(0); }
+
+if ($bootparms{osimageprovmethod} eq 'install' && !$NOAUTOINST) { modifyAutoinstFiles($noderange, \%bootparms); }
+
+if ($bootparms{osimageprovmethod} eq 'sysclone') { copySyscloneFiles(); }
 
 exit(0);
 
+sub isRedhat { return (-e '/etc/redhat-release' || -e '/etc/centos-release' || -e '/etc/fedora-release'); } 
 
 # Query the db for the kernel, initrd, and kcmdline attributes of the 1st node in the noderange
 sub getBootParms {
 	my $nr = shift @_;
 	my %bootparms;
-	my @output = runcmd("nodels $nr bootparams.kernel bootparams.initrd bootparams.kcmdline");
+	my @output = runcmd("nodels $nr bootparams.kernel bootparams.initrd bootparams.kcmdline nodetype.provmethod");
 
 	# the attributes can be displayed in a different order than requested, so need to grep for them
-	my @gresults;
-	foreach my $a (qw(kernel initrd kcmdline)) {
-		my $attr = "bootparams.$a";
-		@gresults = grep(/^\S+:\s+$attr:/, @output);
+	foreach my $attr (qw(bootparams.kernel bootparams.initrd bootparams.kcmdline nodetype.provmethod)) {
+		my ($a) = $attr =~ m/\.(.*)$/;
+		my @gresults = grep(/^\S+:\s+$attr:/, @output);
 		if (!scalar(@gresults)) { die "Error: attribute $attr not defined for the noderange. Did you run 'nodeset <noderange> osimage=<osimage>' ?\n"; }
 		# for now just pick the 1st one. They should all be the same, except for the node name in kcmdline
 		chomp($gresults[0]);
 		$gresults[0] =~ s/^\S+:\s+$attr:\s*//;
+		#print "gresults='$gresults[0]'\n";
+		if ($gresults[0] !~ m/\S/) { die "Error: attribute $attr not defined for the noderange. Did you run 'nodeset <noderange> osimage=<osimage>' ?\n"; }
 		$bootparms{$a} = $gresults[0];
-		if ($a eq 'kcmdline') { $bootparms{$a} =~ s|/install/autoinst/\S+|/install/autoinst/<nodename>|; }
 	}
+	$bootparms{kcmdline} =~ s|/install/autoinst/\S+|/install/autoinst/<nodename>|;
+
+	# from the nodes provmethod, get the osimage provmethod, so we know the type of install
+	@output = runcmd("lsdef -t osimage $bootparms{provmethod} -ci provmethod");
+	chomp($output[0]);
+	if ($output[0] =~ m/^Could not find/) { die "Error: provmethod $bootparms{provmethod} is set for the node, but there is no osimage definition by that name."; }
+	my ($junk, $provmethod) = split(/=/, $output[0]);
+	$bootparms{osimageprovmethod} = $provmethod;
 
 	# get the mgmt node cluster-facing ip addr
-	@output = runcmd('lsdef -t site -i master -c');
+	@output = runcmd('lsdef -t site -ci master');
 	chomp($output[0]);
 	my ($junk, $ip) = split(/=/, $output[0]);
 	$bootparms{mnip} = $ip;
@@ -90,8 +104,13 @@ sub copyFilesToNodes {
 		my $localfile = "/tftpboot/$file";
 		# for the 
 		my $remotefile = '/boot/' . remoteFilename($file);
-		print "Copying $localfile to $nr:$remotefile\n";
-		runcmd("xdcp $nr -p $localfile $remotefile");
+		if ($DRYRUN) {
+			print "Dry run: would copy $localfile to $nr:$remotefile\n";
+		}
+		else {
+			print "Copying $localfile to $nr:$remotefile\n";
+			runcmd("xdcp $nr -p $localfile $remotefile");
+		}
 	}
 }
 
@@ -99,7 +118,7 @@ sub copyFilesToNodes {
 # Form the remote file name, using the last 2 parts of the path, separated by "-"
 sub remoteFilename {
 	my $f = shift @_;
-	$f =~ s|^.*/([^/]+)/([^/]+)$|$1-$2|;
+	$f =~ s|^.*?([^/]+)/([^/]+)$|$1-$2|;
 	return $f;
 }
 
@@ -110,10 +129,12 @@ sub updateGrubOnNodes {
 	my $nr = shift @_;
 	my $bootparms = shift @_;
 	my $vtxt = ($VERBOSE ? '-v' : '');
+	my $dtxt = ($DRYRUN ? '--dryrun' : '');
 	my @output = runcmd('which modifygrub');
 	my $modifygrub = $output[0];
 	chomp($modifygrub);
-	my $cmd = "xdsh $nr -e $modifygrub $vtxt -w $WAITTIME " . remoteFilename($bootparms->{kernel}) . ' ' . remoteFilename($bootparms->{initrd}) . ' ';
+        my $euser ="root";
+	my $cmd = "xdsh $nr -l $euser -e $modifygrub $vtxt $dtxt -w $WAITTIME -p " . $bootparms->{osimageprovmethod} . ' ' . remoteFilename($bootparms->{kernel}) . ' ' . remoteFilename($bootparms->{initrd}) . ' ';
 	# we need to quote the kernel parms, both here when passing it to xdsh, and on the node
 	# when xdsh is passing it to modifygrub. The way to get single quotes inside single quotes
 	# is to quote each of the outer single quotes with double quotes.
@@ -124,8 +145,7 @@ sub updateGrubOnNodes {
 }
 
 
-# Hack the autoinst files to wait in a key spot to make them work even tho it takes
-# the NICs almost a min before they can transmit after a state change.
+# Hack the autoinst files to overcome the nic coming up delay.
 #todo: this has only been tested with SLES nodes
 sub modifyAutoinstFiles {
 	my $nr = shift @_;
@@ -135,30 +155,144 @@ sub modifyAutoinstFiles {
 	my @nodes = runcmd("nodels $nr");
 	chomp(@nodes);
 
+	# Modify chroot.sles to insert a wait in the /etc/init.d/network of each node.  This is
+	# necessary because even tho compute.sles11.softlayer.tmpl configures bonding, when autoyast
+	# reboots the node after installing the rpms, it does not bring up the network in the normal way
+	# at first and seems to skip any bonding and the if-up.d scripts.  So we are left doing this.
+	# (After autoyast is done with all of its post-configuration, it brings up the network in the
+	# normal way, so bonding gets done then, which is good at least.)
+
 	# Edit each file to have chroot.sles insert a wait at the end of /etc/init.d/network
 	# this finds the end of boot.sh script (which is chroot.sles)
 	my $search = '\n\]\]>\s*</source>\s*</script>\s*</chroot-scripts>';
+	# hack the /etc/init.d/network script to put a wait in it
 	my $file = '/mnt/etc/init.d/network';			# at this point in the installation, the permanent file system is just mounted
-	#my $waitstring = 'echo Sleeping for 55s;sleep 55';
-	# this is the string to insert in the nodes /etc/init.d/network script.  It is a while loop pinging the mn, but some of the chars need to be escape for sed
-	my $waitstring = 'echo Waiting to reach xCAT mgmt node...;while \[ \$\(\(xcati+=1\)\) -le 60 \] \&\& ! ping -c2 -w3 ' . $bootparms->{mnip} .'; do echo i=\$xcati ; done; sleep 10';
+	# this is the string to insert in the nodes /etc/init.d/network script.  It is a while loop pinging the mn, but some of the chars need to be escaped for sed
+	my $waitstring = 'echo -n Waiting to reach xCAT mgmt node ' . $bootparms->{mnip} . '.;xcatretries=60;while \[ \$\(\(xcati+=1\)\) -le \$xcatretries \] \&\& ! ping -c2 -w3 ' . $bootparms->{mnip} .' \>\/dev\/null 2\>\&1; do echo -n .; done; if \[ \$xcati -le \$xcatretries \]; then echo success; else echo failed; fi';
 	# this crazy sed string is from google.  It gathers up the whole file into the hold buffer, and then the substitution is done on the whole file
 	my $sedstring = q|sed -n '1h;1!H;${;g;s/\(\t\treload_firewall\n\)\n/\1\t\t| . $waitstring . q(\n\n/g;p;}') . " $file  > $file.new";
 	# finally create the perl replace string that will be used to modify the autoinst file
 	my $replace = "$sedstring\nchmod 755 $file.new; mv -f $file.new $file";
 
-	# now actually update the file
+	# Add a script that gets invoked by the OS after the nic is brought up
+    # Note: this does not work, because midway thru the autoyast process, the if-up.d scripts do not seem to get invoked
+    # so autoyast fails to get the media
+    # these are specific to SLES
+    #my $netdir = '/etc/sysconfig/network';
+    #my $filename = '/etc/sysconfig/network/if-up.d/xcat-sl-wait';
+    #my $mnip = $bootparms->{mnip};
+    #todo: to support rhel, use these values instead
+    #my $netdir='/etc/sysconfig/network-scripts';
+    #my $filename='/sbin/ifup-local';
+	#my $replace = qq(
+#FILENAME=$filename
+#NETDIR=$netdir
+#MNIP=$mnip
+#);
+#	$replace .= q(
+#cat >$FILENAME << EOF1
+#MNIP=$MNIP
+#NETDIR=$NETDIR
+#EOF1
+#
+# this part of the file we do NOT want to expand the variables in the content
+#cat >>$FILENAME << 'EOF2'
+#NIC="$1"
+# look in this ifcfg script to get the nics ip to see if this is the one we should be waiting on
+#NICIP=`awk -F= '/^IPADDR/ {print $2}' $NETDIR/ifcfg-$NIC | tr -d \' `
+#if [ "${NICIP%.*.*}" != "${MNIP%.*.*}" ]; then exit; fi     # hack: compare the 1st 2 octets
+#echo -n Waiting to reach xCAT mgmt node $MNIP.
+#xcatretries=60
+#while [ $((xcati+=1)) -le $xcatretries ] && ! ping -c2 -w3 $MNIP >/dev/null 2>&1; do echo -n .; done
+#if [ $xcati -le $xcatretries ]; then echo " success"; else echo " failed"; fi
+#sleep 3
+#EOF2
+#
+#chmod +x $FILENAME
+#);
+
+	# The compute.sles11.softlayer.tmpl file contains 2 variables (node ip and netmask) that are
+	# not replaced by Template.pm.  Substitute those in the autoinst files now.
+	# Also use our own multiline sed to put the network script hack in.
 	print "Updating /install/autoinst files.\n";
 	foreach my $n (@nodes) {
 		my $f = "/install/autoinst/$n";
+		my ($ip, $netmask, $gateway) = getNodeIpInfo($n);
+		runcmd("sudo sed -i 's/#NODEIPADDR#/$ip/;s/#NODENETMASK#/$netmask/;s/#NODEGATEWAY#/$gateway/' $f");
 		my $matches = sed($f, $search, $replace, mode=>'insertbefore');
 		if (!$matches) { die "Error: could not find the right place in $f to insert the sed of the network wait.\n"; }
 	}
 }
 
 
+# Copy softlayer specific systemimager post-install scripts to the systemimager location.
+# These cause si to use static ip and insert a wait into the bring up of the network.
+sub copySyscloneFiles {
+	my $cmd = "cp -f /opt/xcat/share/xcat/sysclone/post-install/* /install/sysclone/scripts/post-install";
+	print "Copying SoftLayer-specific post scripts to the SystemImager post-install directory.\n";
+	runcmd($cmd);
+}
+
+
+# Get IP and network of a node
+sub getNodeIpInfo {
+	my $node = shift;
+
+	# get ip for the node
+	my @output = runcmd("nodels $node hosts.ip");
+	chomp($output[0]);
+	my ($junk, $ip) = split(/\s+/, $output[0]);
+	#todo: also support getting the ip from name resolution
+	if (!$ip) { die "Error: the ip attribute must be set for $node.\n"; }
+
+	# find relevant network in the networks table
+	# first get the networks in a hash
+	my %networks;
+	@output = runcmd("lsdef -t network -ci net,mask,gateway");
+	foreach my $line (@output) {
+		chomp($line);
+		my ($netname, $attr, $val) = $line =~ m/^(.+):\s+(.+?)=(.+)$/;
+		$networks{$netname}->{$attr} = $val;
+	}
+	# now go thru the networks looking for the correct one
+	my ($netmask, $gateway);
+	foreach my $key (keys %networks) {
+		if (isIPinNet($ip, $networks{$key}->{net}, $networks{$key}->{mask})) {		# found it
+			$netmask = $networks{$key}->{mask};
+			$gateway = $networks{$key}->{gateway};
+			last;
+		}
+	}
+	if (!$netmask) { die "Error: could not find a network in the networks table that $node $ip is part of.\n"; }
+	if (!$gateway) { die "Error: gateway not specified in the networks table for the network that $node $ip is part of.\n"; }
+
+	verbose("IP info for $node: ip=$ip, netmask=$netmask, gateway=$gateway");
+	return ($ip, $netmask, $gateway);
+}
+
+
+# Is the IP in the network/netmask combo
+sub isIPinNet {
+	my ($ip, $net, $mask) = @_;
+	my $ipbin = convert2bin($ip);
+	my $netbin = convert2bin($net);
+	my $maskbin = convert2bin($mask);
+    $ipbin &= $maskbin;
+    if ($ipbin && $netbin && ($ipbin == $netbin)) { return 1; } 
+    else { return 0; }
+}
+
+
+# Convert dotted decimal format (1.2.3.4) to a binary number
+sub convert2bin {
+	my @arr=split(/\./, shift);
+	my ($bin) = unpack('N', pack('C4',@arr ) );
+	return $bin;
+}
+
+
 # this is like multi-line sed replace function
-# Args: filename, search-string, replace-string
+# Args: filename, search-string, replace-string, options (mode=>{insertbefore,insertafter,replace})
 sub sed {
 	my ($file, $search, $replace, %options) = @_;
 	#my $opts = 's';

xCAT-SoftLayer/postscripts/configbond

@@ -0,0 +1,248 @@
+#!/usr/bin/perl
+
+# xCAT postscript for configuring bonding of nics.
+#  Usage:  configbond bond1 eth1 [eth3]
+#
+# Note: this postscript currently has some assumptions that are specific to the softlayer environment.
+#       We only use this to configure bond1, because bond0 gets configured by the node provisioning process.
+#       (altho this script would work for bond0)
+
+use strict;
+# Check number of args
+
+my $nargs = $#ARGV + 1;
+if (scalar(@ARGV) < 2 || scalar(@ARGV) > 3) {
+   system("logger -t xcat -p local4.err  'Usage: configbond <bond> <dev0> [<dev1>]'");
+   exit 1;
+}
+
+my $bond = shift(@ARGV);
+my $nic = $ARGV[0];  
+my @devs;
+foreach my $a (@ARGV) { push(@devs,split('@',$a)); }    # support the new syntax in the xcat configbond postscript
+my $nicips = $ENV{NICIPS};
+my $nicnetworks = $ENV{NICNETWORKS};
+my $net_cnt = $ENV{NETWORKS_LINES};
+
+#todo: change this script so they dont need to specify nicnetworks
+if (!$nicips || !$nicnetworks) { system("logger -t xcat -p local4.err 'configbond: must specify attributes nicips and nicnetworks in the xcat db for this node.'"); exit 1; }
+
+#todo: these are specific to softlayer.  They should be another attribute or argument
+my $bondingopts = 'mode=4 miimon=100 downdelay=0 updelay=0 lacp_rate=fast xmit_hash_policy=1';
+
+my $netmask ='';
+my $ipaddr = '';
+my $nic_num = '';
+my $subnet = '';
+my $nic_net = '';
+my $net_name = '';
+my @nic_nets = (); # array of networks for this nic
+my @nic_ips =();   # array of ipaddresses for this nic
+my @networks = (); # array of all networks from networks table.
+                   # { network_name, subnet, netmask }
+
+system("logger -t xcat -p local4.err  'configbond: Master: $bond'");
+system("logger -t xcat -p local4.err  'configbond: Slaves: @devs'");
+#system("logger -t xcat -p local4.err  'configbond: NIC:           $nic'");
+system("logger -t xcat -p local4.err  'configbond: NICNETWORKS:   $nicnetworks'");
+system("logger -t xcat -p local4.err  'configbond: NICIPS:        $nicips'");
+
+# Update modprobe
+my $file = "/etc/modprobe.d/$bond.conf";
+if (!open(FILE, ">$file")) { system("logger -t xcat -p local4.err 'configbond: cannot open $file.'"); exit 1; }
+
+print FILE "alias $bond bonding\n";
+# the bonding options are put in the ifcfg file instead
+#print FILE "options $bond mode=balance-rr miimon=100\n";
+close FILE;
+
+# create array of network info. Needed in case where there are 
+# more than one ip address per nic and shouldn't be many networks.
+my $net_info;
+my $cnt = 1;
+
+while ( $cnt <= $net_cnt ) {
+    $net_info = $ENV{"NETWORKS_LINE$cnt"};
+    $net_info =~ /^netname=([^\|]*)\|\|/; 
+    $net_name = $1;
+    $net_info =~ /net=([^\|]*)\|\|/;
+    $subnet = $1;
+    $net_info =~ /mask=([^\|]*)\|\|/;
+    $netmask = $1;
+    push @{ $networks[$cnt-1] }, ($net_name, $subnet, $netmask);
+    $cnt +=1; 
+}
+
+# get network or networks for this nic from NICNETWORKS: 
+# eth0:1_0_0_0-255_255_0_0|network2,eth1:1_1_0_0
+# create array of networks for this nic
+foreach my $nic_networks (split(/,/,$nicnetworks)) {
+    my @net = ();
+    if ( $nic_networks =~ /!/ ) {
+        @net = split(/!/,$nic_networks);
+    } else {
+        @net = split(/:/,$nic_networks);
+    }
+    if ($net[0] eq $nic) {
+        @nic_nets = split(/\|/,$net[1]);
+        last;
+    }
+}
+
+# get all nic ipaddress from $nicips: i.e. eth0:1.0.0.1|2.0.0.1,eth1:1.1.1.1
+# Then get all ips for this specific nic, i.e. eth0.
+foreach my $ips (split(/,/,$nicips)) {
+    my @ip = ();
+    if ( $ips =~ /!/ ) {
+        @ip = split(/!/,$ips);
+    } else {
+        @ip = split(/:/,$ips);
+    }
+    if ($ip[0] eq $nic ) {
+        @nic_ips = split(/\|/,$ip[1]);
+    }
+}
+
+
+my $i;
+for ($i=0; $i < (scalar @nic_ips) ; $i++ ) {
+
+    # Time to create the interfaces.
+    # loop through the nic networks, find the matching networks to get the
+    # subnet and netmask and then create the appropriate ifcfg file for linux
+    my $specific_nic = $nic;
+    if ($i > 0) {
+       $specific_nic = $nic . ":" . ($i);
+    }
+
+    #todo: support case in which nicnetworks is not specified, find the correct network by calculation
+    $cnt = 0;
+    $subnet = "";
+    $netmask = "";
+    $net_name = "";
+    while ( $cnt < $net_cnt ) {
+        if ( $networks[$cnt][0] eq $nic_nets[$i] ) {
+        
+            $subnet = $networks[$cnt][1];
+            $netmask = $networks[$cnt][2];
+            $cnt = $net_cnt; # found match - get out.
+        } 
+        else {
+            $cnt++; 
+        }
+    }
+
+    # check that there is a subnet and netmask set
+    if ( !(length($subnet) > 0) || !(length($netmask) > 0) ) {
+        system("logger -t xcat -p local4.err  'configbond: network subnet or netmask not set.'");
+        exit 1;
+    }
+        system("logger -t xcat -p local4.err  'configbond: network subnet and netmask: $subnet, $netmask'");
+        system("logger -t xcat -p local4.err  'configbond: $specific_nic, $nic_ips[$i]'");
+
+    # Write the master info to the ifcfg file
+    if (-d "/etc/sysconfig/network-scripts") {
+        # rhel/centos/fedora
+        my $dir = "/etc/sysconfig/network-scripts";
+        if (!open(FILE, ">$dir/ifcfg-$bond")) { system("logger -t xcat -p local4.err 'configbond: cannot open $dir/ifcfg-$bond.'"); exit 1; }
+
+        print FILE "DEVICE=$bond\n";
+        print FILE "BOOTPROTO=none\n";
+        print FILE "IPADDR=$nic_ips[$i]\n";
+        print FILE "NETMASK=$netmask\n";
+        print FILE "ONBOOT=yes\n";
+        print FILE "USERCTL=no\n";
+        print FILE qq(BONDING_OPTS="$bondingopts"\n);
+        close FILE;
+
+        # Configure slaves
+        my @output = `ip addr show 2>&1`;       # to check for existance of the device later
+        foreach my $dev (@devs) {
+            # as a convenience, make sure the device exists before adding it to the bond
+            if (!grep(m/^\d+:\s+$dev:/, @output)) {
+                system("logger -t xcat -p local4.err  'configbond: not configuring $dev because it does not exist.'");
+                unlink("$dir/ifcfg-$dev");          # in case it was left over in the image we are cloning
+                next;
+            }
+
+            system("logger -t xcat -p local4.err  'configbond: slave dev: $dev'");
+            if (!open(FILE, ">$dir/ifcfg-$dev")) { system("logger -t xcat -p local4.err 'configbond: cannot open $dir/ifcfg-$dev'"); exit 1; }
+            print FILE "DEVICE=$dev\n";
+            print FILE "BOOTPROTO=none\n";
+            print FILE "MASTER=$bond\n";
+            print FILE "ONBOOT=yes\n";
+            print FILE "SLAVE=yes\n";
+            print FILE "USERCTL=no\n";
+            close FILE;
+        }
+        }
+    elsif (-d "/etc/sysconfig/network") {
+        # sles
+        my $dir = "/etc/sysconfig/network";
+        if (!open(FILE, ">$dir/ifcfg-$bond")) { system("logger -t xcat -p local4.err 'configbond: cannot open $dir/ifcfg-$bond.'"); exit 1; }
+
+        print FILE "BOOTPROTO=static\n";
+        print FILE "BONDING_MASTER=yes\n";
+        print FILE "BONDING_MODULE_OPTS='$bondingopts'\n";
+        print FILE "NAME='Bonded Interface'\n";
+        print FILE "IPADDR=$nic_ips[$i]\n";
+        print FILE "NETMASK=$netmask\n";
+        print FILE "STARTMODE=onboot\n";
+        print FILE "USERCONTROL=no\n";
+        my $devnum = 0;
+        my @output = `ip addr show 2>&1`;       # to check for existance of the device later
+        foreach my $dev (@devs) {
+            if (!grep(m/^\d+:\s+$dev:/, @output)) { next; }
+            print FILE "BONDING_SLAVE_$devnum=$dev\n";
+            $devnum++;
+        }
+        close FILE;
+
+        # Configure slaves
+        foreach my $dev (@devs) {
+            # as a convenience, make sure the device exists before adding it to the bond
+            if (!grep(m/^\d+:\s+$dev:/, @output)) {
+                system("logger -t xcat -p local4.err  'configbond: not configuring $dev because it does not exist.'");
+                unlink("$dir/ifcfg-$dev");          # in case it was left over in the image we are cloning
+                next;
+            }
+            
+            system("logger -t xcat -p local4.err  'configbond: slave dev: $dev'");
+            if (!open(FILE, ">$dir/ifcfg-$dev")) { system("logger -t xcat -p local4.err 'configbond: cannot open $dir/ifcfg-$dev'"); exit 1; }
+            print FILE "BOOTPROTO=none\n";
+            print FILE "STARTMODE=hotplug\n";
+            close FILE;
+        }
+        }
+    else {
+        # do not recognize this distro
+        system("logger -t xcat -p local4.err 'configbond: network directory is not either the Red Hat or SuSE format.'");
+        exit 1;
+    }
+
+    # Apply the changes.  Since we are only doing bond1 right now, lets not restart the whole network
+    # so we dont disrupt the installnic connection.  Instead we just need to bring down the slave nics,
+    # and then bring up the bond nic.
+    #runcmd("service network restart");
+    foreach my $dev (@devs) {
+        runcmd("ifdown $dev");
+    }
+    runcmd("ifdown $bond");     # in case it was already up
+    runcmd("ifup $bond");       # note: this wont reload the bonding kernel module, so we are depending on the provisioning process to already have set the correct bonding options
+    system("logger -t xcat -p local4.info 'configbond: successfully configured $specific_nic.'");
+
+}
+exit 0;
+
+sub runcmd {
+	my $cmd = shift @_;
+	$cmd .= ' 2>&1';
+	my @output = `$cmd`;
+	my $rc = $? >> 8;
+	if ($rc) {
+		system("logger -t xcat -p local4.err 'configeth: command $cmd failed with rc $rc: " . join('',@output) . "'");
+		my $errout= "configeth: command $cmd failed with rc $rc.";
+                `echo $errout`;
+		exit $rc;
+	}
+}

xCAT-SoftLayer/postscripts/setdefaultroute

@@ -1,6 +1,28 @@
 #!/bin/bash
 
 # set the default route of the node to the ip address and nic passed in
+# this should be added to the postbootscripts, NOT postscripts
 
-set -x
-ip route replace to default via $1 dev $2
+gateway="$1"
+nic="$2"
+
+# set it temporarily
+echo "ip route replace to default via $gateway dev $nic"
+ip route replace to default via $gateway dev $nic
+
+# set it permanently
+#todo: this is only for sles right now
+file=/etc/sysconfig/network/routes
+if grep -q -E '^default ' $file; then
+	# replace the default route that is already in there
+	sed -i 's/^default .*$/default '$gateway' - -/' $file
+else
+	# no default route yet, append to file
+	echo "default $gateway - -" >>$file
+fi
+
+# While we are here, clean up the network wait hack, if it is still there.
+# (It was added during scripted install, because autoyast will not use the bond
+# configuration for 1 part of the process.)  Do not know a better place to clean
+# this up.
+sed -i '/Waiting to reach xCAT mgmt node/d' /etc/init.d/network

xCAT-SoftLayer/share/xcat/install/sles/compute.sles11.softlayer.tmpl

@@ -67,7 +67,6 @@
       </user>
     </users>
     <networking>
-      <keep_install_network config:type="boolean">true</keep_install_network>
       <dns>
         <domain>#TABLE:site:key=domain:value#</domain>
         <hostname>#TABLE:nodelist:$NODE:node#</hostname>
@@ -78,10 +77,53 @@
           <search>#TABLE:site:key=domain:value#</search>
         </searchlist>
       </dns>
+      <interfaces config:type="list">
+        <interface>
+          <bonding_master>yes</bonding_master>
+          <bonding_module_opts>mode=4 miimon=100 downdelay=0 updelay=0 lacp_rate=fast xmit_hash_policy=1</bonding_module_opts>
+          <bonding_slave0>eth0</bonding_slave0>
+          <bonding_slave1>eth2</bonding_slave1>
+          <device>bond0</device>
+          <bootproto>static</bootproto>
+          <startmode>auto</startmode>
+          <ipaddr>#NODEIPADDR#</ipaddr>
+          <netmask>#NODENETMASK#</netmask>
+          <usercontrol>no</usercontrol>
+        </interface>
+        <interface>
+          <bootproto>none</bootproto>
+          <device>eth0</device>
+          <name>Ethernet Card 0</name>
+          <startmode>off</startmode>
+        </interface>
+        <interface>
+          <bootproto>none</bootproto>
+          <device>eth2</device>
+          <name>Ethernet Card 2</name>
+          <startmode>off</startmode>
+        </interface>
+      </interfaces>
       <routing>
         <ip_forward config:type="boolean">false</ip_forward>
+        <routes config:type="list">
+          <route>
+            <destination>default</destination>
+            <device>-</device>
+            <gateway>#NODEGATEWAY#</gateway>
+            <netmask>-</netmask>
+          </route>
+        </routes>
       </routing>
     </networking>
+    <files config:type="list">
+      <file>
+        <file_contents><![CDATA[alias bond0 bonding
+]]></file_contents>
+        <file_owner>root</file_owner>
+        <file_path>/etc/modprobe.d/bond0.conf</file_path>
+        <file_permissions>644</file_permissions>
+      </file>
+    </files>
     <scripts>
    #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sles#
    #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles#

xCAT-SoftLayer/si-post-install/15all.configefi

@@ -0,0 +1,82 @@
+#!/bin/bash
+
+# SI post-install script to configure the efi boot mgr or grub after SI has installed the OS
+# SI post-install scripts run in a chroot environment of the final OS image
+
+if [ -d /sys/firmware/efi ]; then
+    echo "Setting Boot Manager for the next boot."
+    echo "delete all sysclone boot list"
+    str_bootnums=`efibootmgr | grep 'syscloneLinux' | awk '{print $1}' | sed 's/boot//i' | sed 's/*//'`
+    for str_num in $str_bootnums
+    do
+        efibootmgr -b $str_num -B -q
+    done
+
+    if [ -f "/boot/efi/EFI/redhat/grub.efi" ];then
+        efibootmgr -c -l \\EFI\\redhat\\grub.efi -L syscloneLinux
+    elif [ -f "/boot/efi/efi/SuSE/elilo.efi" ];then
+        efibootmgr -c -l \\efi\\SuSE\\elilo.efi -L syscloneLinux
+    else
+        echo "Can not find the boot loader."
+        exit 1
+    fi
+else
+    echo "run grub-install to configure the MBR."
+    if [ -e /etc/mtab ];then
+        mv /etc/mtab /etc/mtab.bak
+    fi
+    grep -v rootfs /proc/mounts > /etc/mtab
+    boot_device=''
+    if [ -f "/etc/systemconfig/systemconfig.conf" ];then
+        boot_device=`cat /etc/systemconfig/systemconfig.conf | grep BOOTDEV | awk '{print $3}'`
+    else
+        boot_root=`mount | grep -E ' on\s+/ type ' | awk '{print $1}'`
+        boot_device=`echo $boot_root | sed -e 's/[0-9]*$//'`
+
+        #str_temp=`mount | awk '{print $1","$3}'`
+        #for line in $str_temp
+        #do
+        #    mp=`echo $line | awk -F, '{print $2}'`
+        #    if [ "$mp" = "/" ];then
+        #        boot_device=`echo $line | awk -F, '{print $1}' | sed -e 's/[0-9]*$//'`
+        #        break
+        #    fi
+        #done
+    fi
+
+    if [ -n "$boot_device" ];then
+        echo "The boot device is $boot_device"
+        echo "The boot root device is $boot_root"
+    else
+        echo "Can not find the boot device, return error"
+        exit 1
+    fi
+    
+    # set grub to use this boot device
+    if grep -qe '^VERSION\s*=\s*11' /etc/SuSE-release; then
+        #sles11, run grub-install.unsupported directly
+        echo "grub-install.unsupported --no-floppy --recheck $boot_device"
+        grub-install.unsupported --no-floppy --recheck $boot_device
+        # note: the error about grub-set-default not existing is harmless, because we want the default to be 0 anyway
+    else
+        #for sles10, should run grub-install with parameters
+        echo "grub-install --no-floppy --recheck $boot_device"
+        grub-install --no-floppy --recheck $boot_device
+    fi
+
+    # change the entries in the grub conf file to use the correct boot root device
+    # (not the one leftover from the golden image)
+    if [ -f "/boot/grub/grub.conf" ];then
+        conffile="/boot/grub/grub.conf"
+    else
+        conffile="/boot/grub/menu.lst"
+    fi
+    sed -i 's| root=\S*| root='$boot_root'|' $conffile
+    sed -i 's| resume=\S*| noresume|' $conffile
+
+    if [ -e /etc/mtab.bak ];then
+        mv -f /etc/mtab.bak /etc/mtab
+    else
+        rm -f /etc/mtab
+    fi
+fi

xCAT-SoftLayer/si-post-install/16all.updatenetwork

@@ -0,0 +1,209 @@
+#!/bin/bash
+
+# SI post-install script to configure network settings after SI has installed the OS
+# SI post-install scripts run in a chroot environment of the final OS image
+
+. /tmp/post-install/variables.txt
+
+bondingopts='mode=4 miimon=100 downdelay=0 updelay=0 lacp_rate=fast xmit_hash_policy=1'
+
+# determine if we should be using a static ip or dhcp
+staticIP () {
+    # Eventually we should use the SI variable IP_ASSIGNMENT_METHOD below to determine this.
+    # But this requires a patch in both xcat/sysclone (to set si_getimage -ip-assignment method)
+    # and SI (to set IP_ASSIGNMENT_METHOD as a result of that).  Until both of those patches
+    # are in the main releases, assume that if we have set the IPADDR kernel parm for the boot
+    # kernel to use static ip, that the final OS should use static ip too.
+    # Note: the IPADDR environment variable will be set by SI, even if it got it thru dhcp, so
+    #       that is not a reliable way to decide.
+    str=`cat /proc/cmdline`
+    #str='netmask=255.255.255.192 IPADDR=10.54.51.11 GATEWAY=10.54.51.1 dns=10.54.51.2 hostname=sap64-4 DEVICE=eth0'
+    for parm in $str; do
+        key=`echo $parm|awk -F= '{print $1}'`
+        value=`echo $parm|awk -F= '{print $2}'`
+        if [[ $key == "IPADDR" || $key == "ipaddr" ]]; then
+            return 0    # yes, we should use static ip
+        fi
+    done
+    if [[ -n $IP_ASSIGNMENT_METHOD && ${IP_ASSIGNMENT_METHOD,,} == "static" ]]; then
+        return 0    # this means yes/true
+    fi
+    return 1
+}
+
+#delete the udev rule in the image
+rule_file=`ls /etc/udev/rules.d/*net_persistent_names.rules 2>/dev/null`
+if [ -n "$rule_file" ];then
+    rm -f $rule_file
+fi
+
+hostname $HOSTNAME
+bond=bond0
+# this is a softlayer assumption that the two devices on the private net will be eth0 and eth2
+if [[ $DEVICE == "eth0" ]]; then
+    DEVICE2=eth2
+elif [[ $DEVICE == "eth2" ]]; then
+    DEVICE2=eth0
+fi
+ip addr show|grep -q -E "^[0-9]+:\s+$DEVICE2:"          # make sure it exists on the system
+if [[ $? == 0 ]]; then
+    DEVICE2EXISTS="yes"
+fi
+
+device_names=`ifconfig -a | grep -i hwaddr | grep -i 'Ethernet' | grep -v usb| awk '{print $1}'`
+str_cfg_file=''
+if [ -d "/etc/sysconfig/network-scripts/" ];then
+    #redhat
+    dir="/etc/sysconfig/network-scripts"
+    grep -i HOSTNAME /etc/sysconfig/network
+    if [ $? -eq 0 ];then
+        sed -i "s/HOSTNAME=.*/HOSTNAME=$HOSTNAME/g" /etc/sysconfig/network
+    else
+        echo "HOSTNAME=$HOSTNAME" >> /etc/sysconfig/network
+    fi
+    if staticIP; then
+        # delete all nic cfg files left over from the golden node
+        for i in $device_names;do
+            rm -f "$dir/ifcfg-$i"
+        done
+
+        # set static ip from variables in variables.txt
+        # write ifcfg-bond0.  For now we assume the installnic should be part of bond0,
+        # because in SL i think that is always the case.
+        i="$bond"
+        str_cfg_file="$dir/ifcfg-$i"
+        echo "DEVICE=$i" > $str_cfg_file
+        echo "BOOTPROTO=none" >> $str_cfg_file
+        echo "ONBOOT=yes" >> $str_cfg_file
+        echo "USERCTL=no" >> $str_cfg_file
+        echo 'BONDING_OPTS="'$bondingopts'"' >> $str_cfg_file
+        echo "IPADDR=$IPADDR" >> $str_cfg_file
+        echo "NETMASK=$NETMASK" >> $str_cfg_file
+        echo "NETWORK=$NETWORK" >> $str_cfg_file
+        echo "BROADCAST=$BROADCAST" >> $str_cfg_file
+        #todo: add gateway config?  Not sure, because the boot kernels gateway might not be the final OS gateway
+
+        # write ifcfg-eth0
+        i="$DEVICE"
+        str_cfg_file="$dir/ifcfg-$i"
+        echo "DEVICE=$i" > $str_cfg_file
+        echo "BOOTPROTO=none" >> $str_cfg_file
+        echo "MASTER=$bond" >> $str_cfg_file
+        echo "ONBOOT=yes" >> $str_cfg_file
+        echo "SLAVE=yes" >> $str_cfg_file
+        echo "USERCTL=no" >> $str_cfg_file
+
+        i="$DEVICE2"
+        str_cfg_file="$dir/ifcfg-$i"
+        if [[ $DEVICE2EXISTS == "yes" ]]; then
+            # write ifcfg-eth2
+            echo "DEVICE=$i" > $str_cfg_file
+            echo "BOOTPROTO=none" >> $str_cfg_file
+            echo "MASTER=$bond" >> $str_cfg_file
+            echo "ONBOOT=yes" >> $str_cfg_file
+            echo "SLAVE=yes" >> $str_cfg_file
+            echo "USERCTL=no" >> $str_cfg_file
+        else
+            rm -f $str_cfg_file         # in case it was left over in the image that was captured
+        fi
+
+        # write modprobe alias config
+        str_cfg_file="/etc/modprobe.d/$bond.conf"
+        echo "alias $bond bonding" > $str_cfg_file
+
+        #todo: figure out how to set the default gateway in rhel
+    else
+        # use dhcp for all nics
+        for i in $device_names;do
+            str_cfg_file="$dir/ifcfg-$i"
+            echo "DEVICE=$i" > $str_cfg_file
+            echo "BOOTPROTO=dhcp" >> $str_cfg_file
+            echo "NM_CONTROLLED=yes" >> $str_cfg_file
+            echo "ONBOOT=yes" >> $str_cfg_file
+        done
+    fi
+elif [ -d "/etc/sysconfig/network/" ];then
+    #suse
+    dir="/etc/sysconfig/network"
+    echo "$HOSTNAME" > /etc/HOSTNAME
+    if staticIP; then
+        # delete all nic cfg files left over from the golden node
+        for i in $device_names;do
+            rm -f "$dir/ifcfg-$i"
+        done
+
+        # set static ip from variables in variables.txt
+        # write ifcfg-bond0.  For now we assume the installnic should be part of bond0,
+        # because in SL i think that is always the case.
+        i="$bond"
+        str_cfg_file="$dir/ifcfg-$i"
+        echo "BOOTPROTO=static" > $str_cfg_file
+        echo "STARTMODE=onboot" >> $str_cfg_file
+        echo "BONDING_MASTER=yes" >> $str_cfg_file
+        echo "BONDING_MODULE_OPTS='$bondingopts'" >> $str_cfg_file
+        echo "NAME='Bonded Interface'" >> $str_cfg_file
+        echo "IPADDR=$IPADDR" >> $str_cfg_file
+        echo "NETMASK=$NETMASK" >> $str_cfg_file
+        echo "NETWORK=$NETWORK" >> $str_cfg_file
+        echo "BROADCAST=$BROADCAST" >> $str_cfg_file
+        echo "USERCONTROL=no" >> $str_cfg_file
+        echo "BONDING_SLAVE_0=$DEVICE" >> $str_cfg_file
+        if [[ $DEVICE2EXISTS == "yes" ]]; then
+            echo "BONDING_SLAVE_1=$DEVICE2" >> $str_cfg_file
+        fi
+
+        # write ifcfg-eth0
+        i="$DEVICE"
+        str_cfg_file="$dir/ifcfg-$i"
+        echo "BOOTPROTO=none" > $str_cfg_file
+        echo "STARTMODE=hotplug" >> $str_cfg_file
+
+        i="$DEVICE2"
+        str_cfg_file="$dir/ifcfg-$i"
+        if [[ $DEVICE2EXISTS == "yes" ]]; then
+            # write ifcfg-eth2
+            echo "BOOTPROTO=none" > $str_cfg_file
+            echo "STARTMODE=hotplug" >> $str_cfg_file
+        else
+            rm -f $str_cfg_file         # in case it was left over in the image that was captured
+        fi
+
+        # write modprobe alias config
+        str_cfg_file="/etc/modprobe.d/$bond.conf"
+        echo "alias $bond bonding" > $str_cfg_file
+
+        # set the default gateway (at this point this is the private nic gateway, to handle provision across vlans)
+        file=/etc/sysconfig/network/routes
+        if grep -q -E '^default ' $file; then
+            # replace the default route that is already in there
+            sed -i 's/^default .*$/default '$GATEWAY' - -/' $file
+        else
+            # no default route yet, append to file
+            echo "default $GATEWAY - -" >>$file
+        fi
+
+        # this was the original config of the eth0 nic (without bonding)
+        #echo "DEVICE=$i" > $str_cfg_file
+        #echo "BOOTPROTO=static" >> $str_cfg_file
+        #echo "STARTMODE=onboot" >> $str_cfg_file
+        #echo "IPADDR=$IPADDR" >> $str_cfg_file
+        #echo "NETMASK=$NETMASK" >> $str_cfg_file
+        #echo "NETWORK=$NETWORK" >> $str_cfg_file
+        #echo "BROADCAST=$BROADCAST" >> $str_cfg_file
+        #todo: add gateway config?  Not sure, because the boot kernels gateway might not be the final OS gateway
+    else
+        # use dhcp for all nics
+        for i in $device_names;do
+            str_cfg_file="$dir/ifcfg-$i"
+            echo "DEVICE=$i" > $str_cfg_file
+            echo "BOOTPROTO=dhcp" >> $str_cfg_file
+            echo "STARTMODE=onboot" >> $str_cfg_file
+            echo "DHCLIENT_PRIMARY_DEVICE=yes" >> $str_cfg_file
+        done
+    fi
+else
+    #ubuntu
+    echo "Does not support ubuntu."
+    exit 1
+fi
+

xCAT-SoftLayer/si-post-install/20all.makeinitrd

@@ -0,0 +1,20 @@
+#!/bin/bash
+#Used only by sysclone
+
+# This SI post-install script is needed because the initrd that autoyast/kickstart/ubuntu builds when installing
+# sles/rh/ubuntu on the golden node may not have the drivers when that initrd runs on the node that is
+# being deployed with this image (specifically, drivers to be able to mount the disk).
+# So rebuild the initrd on the to-node after putting the image on the disk, but before rebooting.
+
+#todo: Make this script work on red hat by checking for dracut and using that if it exists.
+#		And do whatever is necessary on ubuntu.
+
+if [[ -f /sbin/dracut ]]; then
+    # redhat/centos
+    echo "Running dracut to regenerate the initrd with the drivers needed by this node:"
+    dracut  --force
+else
+    # suse/sles
+    echo "Running mkinitrd to regenerate the initrd with the drivers needed by this node:"
+    mkinitrd
+fi

xCAT-SoftLayer/si-post-install/99all.killsyslog

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# SI post-install script, run after SI has installed the OS, to kill processes SI does not kill
+# (so /a can be umounted cleanly)
+# SI post-install scripts run in a chroot environment of the final OS image
+
+if [ -f "/etc/SuSE-release" ];then
+    str_out=`ps -ef | grep -v grep | grep syslog-ng`
+    if [ $? -eq 0 ];then
+        str_id=`echo $str_out | awk '{print $2}'`
+        kill -9 $str_id
+    fi
+fi
+
+# SI starts klogd in the chroot, but does not kill it.  Remove this line when SI fixes their bug.
+killall klogd
+
+# flush all write buffers, just in case SI can not umount /a
+echo "Syncing file systems"
+sync
+
+#todo: remove
+#echo "Processes still using /:"
+#fuser -v /
+#sleep 30

xCAT-SoftLayer/xCAT-SoftLayer.spec

@@ -17,6 +17,11 @@ BuildArch: noarch
 Requires: xCAT-server
 #Requires: xCAT-server  >= %{epoch}:%(cat Version|cut -d. -f 1,2)
 
+# perl-ExtUtils-MakeMaker, perl-CPAN, perl-Test-Harness are only available in rhel.
+# When this rpm supports being installed in sles, need to add these to xcat-dep.
+# perl-SOAP-Lite is already in xcat-dep
+Requires: perl-ExtUtils-MakeMaker perl-CPAN perl-Test-Harness perl-SOAP-Lite
+
 Provides: xCAT-SoftLayer = %{epoch}:%{version}
 
 %description
@@ -43,18 +48,22 @@ xCAT-SoftLayer provides Utilities to make xCAT work in a SoftLayer environment.
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/bin
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/install
-mkdir -p $RPM_BUILD_ROOT/install/postscripts
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/postscripts
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT-SoftLayer
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/man/man1
 mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/doc/man1
+mkdir -p $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/post-install
 
 cp -p -R share/xcat/install/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/install/
 
 cp -d bin/* $RPM_BUILD_ROOT/%{prefix}/bin
 chmod 755 $RPM_BUILD_ROOT/%{prefix}/bin/*
 
-cp -d postscripts/* $RPM_BUILD_ROOT/install/postscripts
-chmod 755 $RPM_BUILD_ROOT/install/postscripts/*
+cp -d postscripts/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/postscripts
+chmod 755 $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/postscripts/*
+
+cp -d si-post-install/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/post-install
+chmod 755 $RPM_BUILD_ROOT/%{prefix}/share/xcat/sysclone/post-install/*
 
 cp LICENSE.html $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT-SoftLayer
 chmod 644 $RPM_BUILD_ROOT/%{prefix}/share/doc/packages/xCAT-SoftLayer/*
@@ -71,4 +80,13 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 #%doc LICENSE.html
 %{prefix}
-/install/postscripts
+
+%post
+# We are shipping the postscripts in a sysclone dir and then copying them to /install/postscripts here,
+# because we want to allow base xcat to eventually ship them and not conflict on the file name/path
+# But base xcat now has a newer/better configbond written in bash, so if that is there do not overwrite it.
+head /install/postscripts/configbond | grep -q -E '^#! */bin/bash'
+if [[ $? != 0 ]]; then
+    # the new configbond from xcat 2.8.5 is not there, so copy ours
+	cp -f /%{prefix}/share/xcat/sysclone/postscripts/* /install/postscripts
+fi

xCAT-client/bin/db2sqlsetup

@@ -590,13 +590,16 @@ sub startxcatd
       } else {
         $xcmd = "$::XCATROOT/sbin/restartxcatd";
       }
+      system($xcmd);
 
    }
    else
    {
-     $xcmd = "service xcatd restart";
+     #$xcmd = "service xcatd restart";
+     my $ret=xCAT::Utils->restartservice("xcatd");
+     return $ret;
    }
-   system($xcmd);
+
 }
 
 #-----------------------------------------------------------------------------
@@ -618,13 +621,16 @@ sub shutdownxcatd
     if ($::osname eq 'AIX')
     {
         $xcmd = "stopsrc -s xcatd";
+        system($xcmd);
 
     }
     else
     {
-        $xcmd = "service xcatd stop";
+        #$xcmd = "service xcatd stop";
+        my $ret=xCAT::Utils->stopservice("xcatd");
+        return $ret;
     }
-    system($xcmd);
+
 }
 
 #-----------------------------------------------------------------------------
@@ -1872,7 +1878,7 @@ sub restorexcatdb
     # restore the database
     xCAT::MsgUtils->message(
         "I",
-        "Restoring the xCat Database with $::backupdir to DB2 database.\nThis could take several minutes."
+        "Restoring the xCAT Database with $::backupdir to DB2 database.\nThis could take several minutes."
         );
     if (!(-d $::backupdir))
     {    # does not exist, error
@@ -2073,11 +2079,12 @@ sub adddb2paths
 #-----------------------------------------------------------------------------
 sub remove
 {
-	my $cmd;
-	my @output;
-	my $error = 0;
-	#see if DB2 is installed
-	if (!(-e ($::installdb2dir)))
+    my $cmd; 
+    my @output;
+    my $error = 0;
+    my $retcode=0;
+    #see if DB2 is installed
+    if (!(-e ($::installdb2dir)))
     {
         my $message =
           "\nDB2 is not installed.";
@@ -2120,18 +2127,23 @@ sub remove
             	
             	my $cmd = "ps -elf|grep xcatd";
                 my @output = xCAT::Utils->runcmd($cmd, 0);
+
                 if ($::RUNCMD_RC == 0)
                 {      
                     if ($::osname eq 'AIX')
                     {
                     	my $cmd = "startsrc -s xcatd";
+                        xCAT::Utils->runcmd($cmd, -1);
+                        $retcode=$::RUNCMD_RC;
                     }
                     else
                     {           
-                    	my $cmd = "service xcatd start";
+                    	#my $cmd = "service xcatd start";
+                    	$retcode=xCAT::Utils->startservice("xcatd");
                     }
-                    xCAT::Utils->runcmd($cmd, -1);
-            	    if ($::RUNCMD_RC !=0)
+                    #xCAT::Utils->runcmd($cmd, -1);
+            	    #if ($::RUNCMD_RC !=0)
+            	    if($retcode!=0)
             	    {
             	    	my $message = "can't start xcatd";
             	    	$error += 1;
@@ -2155,13 +2167,17 @@ sub remove
             if ($::osname eq 'AIX')
             {
             	my $cmd = "stopsrc -s xcatd";
+                xCAT::Utils->runcmd($cmd, -1);
+                $retcode=$::RUNCMD_RC;
             }
             else
             {           
-            	my $cmd = "service xcatd stop";
+            	#my $cmd = "service xcatd stop";
+            	$retcode=xCAT::Utils->stopservice("xcatd");
             }
-            xCAT::Utils->runcmd($cmd, -1);
-            if ($::RUNCMD_RC !=0)
+            #xCAT::Utils->runcmd($cmd, -1);
+            #if ($::RUNCMD_RC !=0)
+            if($retcode!=0)
             {
             	my $message = "can't stop xcatd";
             	xCAT::MsgUtils->message("E", "$message");
@@ -2198,13 +2214,17 @@ sub remove
             if ($::osname eq 'AIX')
             {
             	my $cmd = "startsrc -s xcatd";
+                xCAT::Utils->runcmd($cmd, -1);
+                $retcode=$::RUNCMD_RC; 
             }
             else
             {           
-            	my $cmd = "service xcatd start";
+            	#my $cmd = "service xcatd start";
+            	$retcode=xCAT::Utils->startservice("xcatd");
             }
-            xCAT::Utils->runcmd($cmd, -1);
-            if ($::RUNCMD_RC !=0)
+            #xCAT::Utils->runcmd($cmd, -1);
+            #if ($::RUNCMD_RC !=0)
+            if($retcode!=0)
             {
             	my $message = "can't start xcatd";
             	xCAT::MsgUtils->message("E", "$message");

xCAT-client/bin/genimage

@@ -176,7 +176,8 @@ if ((!$imagename) && (!$os)){
     my @dircontents = `ls $installdir`;
     chomp(@dircontents);
     foreach (@dircontents) {
-	if($_ =~ /(rhel|fedora|sl|centos|suse)/){
+	# SL matches Scientific Linux, sl matches sles amd sled
+	if($_ =~ /(rhel|fedora|SL|centos|sl|suse)/){
 	    push @oses,$_;
 	}
     } 

xCAT-client/bin/getxcatdocs

@@ -1,190 +1,214 @@
 #!/usr/bin/perl
-# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 
-# Downloads/converts the xCAT docs on the sourceforge wiki to local HTML and PDF.
+
+# Downloads/converts the xCAT docs on the sourceforge Allura wiki to local HTML and PDF.
 # This script is not dependent on other xCAT code, so you can copy it to a machine
 # that has internet access to run it.  Before running this command, you must have
-# wget, python, and pisa installed.  See: http://sourceforge.net/apps/mediawiki/xcat/index.php?title=Editing_xCAT_Documentation_Pages#Converting_Wiki_Pages_to_HTML_and_PDFs .
+# curl, pandoc, and latex installed.  See: http://sourceforge.net/p/xcat/wiki/Editing_and_Downloading_xCAT_Documentation/#converting-wiki-pages-to-html-and-pdfs
+
 
 # Note: do not use the --upload option, unless your machine has authority to write to http://xcat.sourceforge.net/doc/ .
-#       You also need to set $UPLOADUSER to your sourceforge user.
+#       You also need to set $UPLOADUSER to your sourceforge user:
+my $UPLOADUSER = 'mellor';
 
-#BEGIN
-#{
-#    $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr';
-#}
 use strict;
-#use lib "$::XCATROOT/lib/perl";
-#use xCAT::Utils;
 use Getopt::Long;
-#use File::Path;
 use Cwd;
-#use Data::Dumper;
+use JSON;
+
+# URL for the xCAT Allura wiki API markdown on SourceForge
+my $sf_url='http://sourceforge.net/rest';
+my $wiki_url=$sf_url.'/p/xcat/wiki/';
+
+# Update this list if you group any xcat docs on a separate page such that they
+# are no longer linked from the main doc page:
+my @indexdocs = ('XCAT_Documentation', 
+                 'Power_775_Cluster_Documentation', 
+                 'Highly_Available_Management_Node', 
+                 'Mixed_Cluster_Support', 
+                 'IBM_HPC_Stack_in_an_xCAT_Cluster');
 
-# Update this list if you group any xcat docs on a separate page such that they are no longer linked from the
-# main doc page.
-my @indexdocs = ('XCAT_Documentation', 'Power_775_Cluster_Documentation', 'Highly_Available_Management_Node', 'Mixed_Cluster_Support','IBM_HPC_Stack_in_an_xCAT_Cluster');
 
-#my $VERSION;
 my $HELP;
 my $UPLOAD;
 my $UPLOADONLY;
+my $IGNOREERRORS;
+my $SINGLE_DOC;
 my $VERBOSE;
- 
-my $usage = sub {
-   	my $exitcode = shift @_;
-   	print "Usage: getxcatdocs [-?|-h|--help] [-v|--verbose] [-u|--upload] [--uploadonly] [<destination-dir>]\n";
-	exit $exitcode;
-};
-
-# Process the cmd line args
-Getopt::Long::Configure("bundling");
-#Getopt::Long::Configure("pass_through");
-Getopt::Long::Configure("no_pass_through");
-if (!GetOptions('h|?|help'  => \$HELP, 'v|verbose' => \$VERBOSE, 'u|upload' => \$UPLOAD, 'uploadonly' => \$UPLOADONLY )) { $usage->(1); }
-
-if ($HELP) { $usage->(0); }
-
-#if ($VERSION) {
-    #print xCAT::Utils->Version(), "\n";
-#    exit;
-#}
-
-if ($^O =~ /^aix/i) { die "Error: this command is not yet supported on AIX.\n"; }
-
-my $destdir = scalar(@ARGV) ? $ARGV[0] : '.';
-chdir($destdir) or die "Can not cd to $destdir: $!\n";
-#my $docdir = $ENV{'PWD'};
-
-# Download the HTML docs and convert them all to pdfs
-my @dir;
-if (!$UPLOADONLY) {
-	@dir = gethtmldocs('html');
-	convert2pdf('pdf', \@dir);
-}
-
-
-# tar/compress
-my $date=`date +%Y%m%d%H%M`;
-chop $date;
-my $docname="xcat-docs-snap$date.tar.gz";
-#system('pwd');
-my $cmd = "tar -zcf $docname html pdf 2>&1";
-verbose($cmd);
-system($cmd) == 0 or die "Error running $cmd: $!, rc=$?";
-
-# Optionally upload the tarball to sourceforge
-if ($UPLOAD || $UPLOADONLY) {
-	my $UPLOADUSER = 'bp-sawyers';
-	my $count = 1;
-	#my $cmd = "rsync -v $docname $UPLOADUSER," . 'xcat@web.sourceforge.net:htdocs/doc/';
-	my $cmd = "rsync -v $docname $UPLOADUSER," . 'xcat@web.sourceforge.net:/home/frs/project/x/xc/xcat/doc/';
-	print "$cmd\n";
-	while ($count<=5 && system("$cmd 2>&1")) { $count++; }
-}
-exit 0;
-
 
 sub verbose { if ($VERBOSE) { print shift, "\n"; } }
 
+my $usage = sub {
+    my $exitcode = shift @_;
+    print "Usage: getxcatdocs [-?|-h|--help] \n";
+    print "Usage: getxcatdocs [-v|--verbose] [-u|--upload] [--uploadonly] [-i|--ignoreerrors] [<destination-dir>]\n";
+    print "Usage: getxcatdocs [-v|--verbose] [-d|--doc single_doc] [-i|--ignoreerrors] [<destination-dir>]\n";
+    exit $exitcode;
+};
+
+
+# Main processing
+
+    # Process the cmd line args
+    Getopt::Long::Configure("bundling");
+    #Getopt::Long::Configure("pass_through");
+    Getopt::Long::Configure("no_pass_through");
+    if (!GetOptions(
+         'h|?|help'    => \$HELP, 
+         'v|verbose'   => \$VERBOSE, 
+         'u|upload'    => \$UPLOAD, 
+         'uploadonly'  => \$UPLOADONLY, 
+         'i|ignoreerrors'    => \$IGNOREERRORS, 
+         'd|doc=s'     => \$SINGLE_DOC ))
+          { $usage->(1); }
+
+    if ($HELP) { $usage->(0); }
+
+    if ($^O =~ /^aix/i) { die "Error: this command is not yet supported on AIX.\n"; }
+
+    my $destdir = scalar(@ARGV) ? $ARGV[0] : '.';
+    chdir($destdir) or die "Can not cd to $destdir: $!\n";
+
+    my $json = JSON->new(); 
+
+    if ($SINGLE_DOC) {
+      my $scurlcmd = "curl -X GET $wiki_url$SINGLE_DOC";
+      verbose($scurlcmd);
+      my $pagecontent = `$scurlcmd`;
+      if ($? && !$IGNOREERRORS) { die "error encountered in $scurlcmd \n";}
+      my $pageout = $json->decode($pagecontent);
+      foreach my $pageatt (@{$pageout->{attachments}}) {
+         my $swgetcmd = "wget $pageatt->{url}";
+         verbose($swgetcmd);
+         system($swgetcmd);
+         if ($? && !$IGNOREERRORS) { die "error encountered in $swgetcmd \n";}
+      }
+      convert_doc($SINGLE_DOC,$pageout->{text},'.','.','.','.');
+      exit;
+    }      
+   
+    # Download the HTML docs and convert them all to pdfs
+    if (!$UPLOADONLY) { gethtmldocs('md','html','pdf','images'); }
+
+    # tar/compress
+    my $date=`date +%Y%m%d%H%M`;
+    chop $date;
+    my $docname="xcat-docs-snap$date.tar.gz";
+    chdir($destdir) or die "Can not cd to $destdir: $!\n";
+
+    my $cmd = "tar -zcf $docname html pdf images 2>&1";
+    verbose($cmd);
+    system($cmd) == 0 or die "Error running $cmd: $!, rc=$?";
+
+    # Optionally upload the tarball to sourceforge
+    if ($UPLOAD || $UPLOADONLY) {
+        my $count = 1;
+        #my $cmd = "rsync -v $docname $UPLOADUSER," . 'xcat@web.sourceforge.net:htdocs/doc/';
+        my $cmd = "rsync -v $docname $UPLOADUSER," . 'xcat@web.sourceforge.net:/home/frs/project/x/xc/xcat/doc/';
+        print "$cmd\n";
+        while ($count<=5 && system("$cmd 2>&1")) { $count++; }
+    }
+    exit 0;
+
+
 
-# Download all of the html docs from several "index" docs
 sub gethtmldocs {
-	my $dir = shift;
-	my $savedir = getcwd();
-	#File::Path::make_path($dir);
-	mkdir($dir);
-	chdir($dir);
-	#system('pwd');
-	unlink <*>;		# delete all the files in the dir, in case they previously ran this
-	#system('ls');
-	
-	my $indexes = '';
-	foreach my $index (@indexdocs) {
-		$indexes .= qq('http://sourceforge.net/apps/mediawiki/xcat/index.php?title=$index&printable=yes' );
-	}
-	print "Downloading the xCAT wiki documentation to $dir, from: $indexes ...\n";
-	runwget($indexes);
-	
-	# Remove the funny chars from the links to other docs and rename the docs
-	#my $sedcmd = q(sed -i 's/<a href="\/apps\/mediawiki\/xcat\/index.php?title/<a href="index.php%3Ftitle/' *);
-	# sed -i 's/href="index.php%3Ftitle=/href="/g' index.php\?title\=
-	# sed -i 's/<a href="\([^"]*\)"/<a href="\1.html"/'
-	# This searches for '<a href="index.php?title=' and then all text before a '"' or '#', and then removes the front part and add .html on the end
-	# Note: this does not convert the 'MediaWiki:*' files because they are used in <link> tags, but converting them does not seem to do any good anyway.
-	my $cmd = q(sed -i 's/<a href="index.php?title=\\([^"#]*\\)\\("\|#\\)/<a href="\1.html\2/g' *);
-	verbose($cmd);
-	system($cmd) == 0 or die "Error running $cmd: $!, rc=$?";
-	# get the list of docs
-	opendir(DIR, '.') or die "Error: could not read the just created html directory.\n";
-	#my @docs = grep /^index.php\?title=/, readdir(DIR);		# /
-	my @docs;
-	foreach my $f (readdir(DIR)) {
-		if ($f !~ /^index.php\?title=/ || $f =~ /^index.php\?title=MediaWiki:/) { next; }
-		my $newf = $f;
-		$newf =~ s/^index.php\?title=//;
-		if ($newf !~ /\./) { $newf .= '.html'; }
-		verbose("Renaming $f to $newf");
-		rename($f, $newf);
-		push @docs, $newf;
-	}
-	close(DIR);
-	chdir($savedir);
-	return @docs;
+
+    my $mddir = shift;
+    my $htmldir = shift;
+    my $pdfdir = shift;
+    my $imagedir = shift;
+    my $savedir = getcwd();
+    mkdir($mddir);
+    mkdir($htmldir);
+    mkdir($pdfdir);
+    mkdir($imagedir);
+    #delete all the files in the dirs in case they previously ran this
+    unlink <$mddir/*>;   
+    unlink <$htmldir/*>;   
+    unlink <$pdfdir/*>;   
+    unlink <$imagedir/*>;   
+                                    
+   print "\nDownloading and converting the xCAT wiki document list from $wiki_url ...\n";
+    my @doclist;
+    my %donelist;
+    foreach my $index (@indexdocs) {
+      if ( $donelist{$index} ) { next; }
+      my $indexcmd = "curl -X GET $wiki_url/$index";
+      verbose($indexcmd);
+      my $indexmd = `$indexcmd`;
+      if ($? && !$IGNOREERRORS) { die "error encountered in $indexcmd \n";}
+      my $jsout = $json->decode($indexmd); 
+      push @doclist,@{$jsout->{related_artifacts}};
+      foreach my $att (@{$jsout->{attachments}}) {
+        my $iwgetcmd = "wget -P $imagedir/ $att->{url}";
+        verbose($iwgetcmd);
+        system($iwgetcmd);
+        if ($? && !$IGNOREERRORS) { die "error encountered in $iwgetcmd \n";}
+      }
+      convert_doc($index,$jsout->{text},$mddir,$htmldir,$pdfdir,$imagedir);
+      $donelist{$index}=1;
+    }
+    print "\nDownloading and converting the xCAT wiki documentation to $savedir ...\n";
+
+    foreach my $doc (@doclist) {
+      my $doc_name = $doc;
+      $doc_name =~ s/\/.*\/(.+)\/$/$1/;
+      if ( $donelist{$doc_name} ) { next; }
+      verbose("processing $doc");
+      my $doc_url=$sf_url.$doc;
+      my $curlcmd = "curl -X GET $doc_url";
+      verbose($curlcmd);
+      my $pagecontent = `$curlcmd`;
+      my $pageout = $json->decode($pagecontent);
+      foreach my $pageatt (@{$pageout->{attachments}}) {
+         my $wgetcmd = "wget -P $imagedir/ $pageatt->{url}";
+         system($wgetcmd);
+         if ($? && !$IGNOREERRORS) { die "error encountered in $wgetcmd \n";}
+      }
+      convert_doc($doc_name,$pageout->{text},$mddir,$htmldir,$pdfdir,$imagedir);
+      $donelist{$doc_name}=1;
+    }
+  
+    chdir($savedir);
 }
 
+sub convert_doc {
+   my $doc_name = shift;
+   my $doc_text = shift;
+   my $mddir = shift;
+   my $htmldir = shift;
+   my $pdfdir = shift;
+   my $imagedir = shift;
+
+  ## Make image refs local
+   $doc_text =~ s/\!\[\]\(.+\/(.+)\.png\)/\!\[\]\(\.\.\/$imagedir\/$1\.png\)/g;
+   $doc_text =~ s/\!\[\]\(.+\/(.+)\.PNG\)/\!\[\]\(\.\.\/$imagedir\/$1\.PNG\)/g;
+   $doc_text =~ s/\!\[\]\(.+\/(.+)\.jpg\)/\!\[\]\(\.\.\/$imagedir\/$1\.jpg\)/g;
+   open(MDFILE, ">$mddir/${doc_name}.md") or die;
+   print MDFILE $doc_text;
+   close MDFILE;
+
+   my $pandoccmd = "pandoc -s --toc $mddir/${doc_name}.md -o $htmldir/${doc_name}.html";
+   verbose($pandoccmd);
+   system($pandoccmd);
+   if ($? && !$IGNOREERRORS) { die "error encountered in $pandoccmd \n";}
+   # This rename is probably a hack, but I didn't want to take the time to
+   # figure out what was going on:
+   #   pandoc does different processing if target filetype is html
+   #   but all internal refs only work in browser when there is no html filetype
+   rename "$htmldir/${doc_name}.html","$htmldir/${doc_name}";
+
+   $doc_text =~ s/\!\[\]\(\.\.\/$imagedir\/(.+)\.png\)/\!\[\]\(\.\/$imagedir\/$1\.png\)/g;
+   $doc_text =~ s/\!\[\]\(\.\.\/$imagedir\/(.+)\.PNG\)/\!\[\]\(\.\/$imagedir\/$1\.PNG\)/g;
+   $doc_text =~ s/\!\[\]\(\.\.\/$imagedir\/(.+)\.jpg\)/\!\[\]\(\.\/$imagedir\/$1\.jpg\)/g;
+   open(MDFILE, ">$mddir/${doc_name}.md") or die;
+   print MDFILE $doc_text;
+   close MDFILE;
+   my $pandoccmd2 = "pandoc --toc $mddir/${doc_name}.md -o $pdfdir/${doc_name}.pdf";
+   verbose($pandoccmd2);
+   system($pandoccmd2);
+   if ($? && !$IGNOREERRORS) { die "error encountered in $pandoccmd2 \n";}
 
-# Convert to pdf
-sub convert2pdf {
-	my ($dir, $files) = @_;
-	my $savedir = getcwd();
-	#File::Path::make_path($dir);
-	mkdir($dir);
-	chdir($dir);
-	if (system('which xhtml2pdf >/dev/null 2>&1')) { die "xhtml2pdf is not installed.  See http://sourceforge.net/apps/mediawiki/xcat/index.php?title=Editing_xCAT_Documentation_Pages#Converting_Wiki_Pages_to_HTML_and_PDFs .\n"; }
-	unlink <*>;		# delete all the files in the dir, in case they previously ran this
-	foreach my $file (@$files) {
-		#if ($file =~ /^index.php\?title=MediaWiki:/ || $file eq 'index.php?title=XCAT_Documentation') { next; }
-		if ($file eq 'XCAT_Documentation') { next; }
-		#my ($docname) = $file =~ /^index.php\?title=(.+)$/;
-		$file =~ s/\.html$//;
-		print "Converting $file to PDF format...\n";
-		my $url = 'http://sourceforge.net/apps/mediawiki/xcat/index.php?title=' . $file . '&printable=yes';
-		my $destfile = "$file.pdf";
-		my $cmd = "xhtml2pdf '$url' '$destfile' ";
-		runh2p($cmd);
-	}
-	chdir($savedir);
 }
 
-
-# Run the wget cmd and filter out some of the silly output
-sub runwget {
-	my $index = shift;
-	# options we might consider: --html-extension --restrict-file-names=windows  --cut-dirs=3
-	# options that do not work:  --relative
-	#my $rejectlist = q('*title=Special:*,*title=Talk:*,*title=-&*,*title=HowTos,*title=Main_Page,*title=MediaWiki:*,*title=Release_Notes,*title=Wish_List_for_xCAT_2,*&action=edit*,*&action=history*,*&printable=yes*,*&oldid=*,index.html,opensearch_desc.php,xcat,login.php,support');
-	my $rejectlist = q('*title=Special:*,*title=Talk:*,*title=-&*,*title=HowTos,*title=Main_Page,*title=Release_Notes,*title=Wish_List_for_xCAT_2,*&action=edit*,*&action=history*,*&printable=yes*,*&oldid=*,index.html,opensearch_desc.php,xcat,login.php,support');
-	my $cmd = qq(wget --recursive --convert-links --no-verbose --progress=bar --level=1 --page-requisites --no-parent --no-host-directories --no-directories --no-clobber --execute robots=off --post-data='printable=yes' --reject $rejectlist $index);
-	verbose($cmd);
-	open(OUT, "$cmd 2>&1 |") || die "can't fork $cmd: $!\n";
-	while (<OUT>) {
-		if (/URL:https*:\/\/sourceforge\.net.+\s+->\s+\"(\S+)\"\s+\[/) { print "Downloaded $1.\n"; }
-		else { print; }
-	}
-	close OUT || die "Error running $cmd: $! $?";
-}
-
-# Run the xhtml2pdf cmd and filter out some of the silly output
-sub runh2p {
-	my $cmd = shift;
-	verbose($cmd);
-	open(OUT, "$cmd 2>&1 |") || die "can't fork $cmd: $!\n";
-	while (<OUT>) {
-		next if /DeprecationWarning:\sthe sets module is deprecated/;
-		next if /from sets import ImmutableSet/;
-		next if /^Converting\ssourceforge.net/;
-		print;
-	}
-	close OUT || die "Error running $cmd: $! $?";
-}

xCAT-client/bin/mysqlsetup

@@ -8,10 +8,9 @@
 
 
 
- This is script is called after the installation or upgrade of MySQL 
-   on xCAT.  It will automate the setup of the MySQL and xCAT to run
-   xCAT on the MySQL DB.
-   Note: if will setup an xcatdb,a xcatadmin, and a MySQL root password. 
+ This script  automates the setup of the MySQL/MariaDB server  and creates the xCAT database to run
+  xCAT on MySQL/MariaDB.
+   Note: it will setup an xcat database (xcatdb),a xcatadmin id , and a MySQL root password. 
    It will interact for the
    password to assign, unless the XCATMYSQLADMIN_PW and the XCATMYSQLROOT_PW 
    env variables are set to the admin and mysql root password, resp.   
@@ -150,8 +149,8 @@ $::linuxos = xCAT::Utils->osver();
 
 #
 # check to see if mysql is installed
-#
-my $cmd = "rpm -qa | grep mysql";
+ #
+my $cmd = "rpm -qa | grep -i perl-DBD-mysql";
 if ( $::debianflag ){
     $cmd = "dpkg -l | grep mysql-server";
 }
@@ -159,10 +158,17 @@ xCAT::Utils->runcmd($cmd, 0);
 if ($::RUNCMD_RC != 0)
 {
     my $message =
-      "\nMySQL is not installed.  If on AIX, it should be first obtained from the xcat dependency tarballs and installed before running this command.\n If on Linux, install from the OS CDs.";
+      "\nMySQL perl DBD is not installed.  If on AIX, it should be first obtained from the xcat dependency tarballs and installed before running this command.\n If on Linux, install from the OS CDs.";
     xCAT::MsgUtils->message("E", " $cmd failed. $message");
     exit(1);
 }
+# is this MariaDB or MySQL
+$::MariaDB=0;
+$cmd = "rpm -qa | grep -i mariadb";  # check this is MariaDB not MySQL
+xCAT::Utils->runcmd($cmd, -1);
+if ($::RUNCMD_RC == 0) {
+   $::MariaDB=1;
+}
 
 # check to see if  MySQL  is running
 $::mysqlrunning     = 0;
@@ -328,7 +334,6 @@ if (($::INIT) && ($::xcatrunningmysql == 0))
     # MySQL not running, then initialize the database
     if ($::mysqlrunning == 0)
     {
-
         # Add mysql user and group for AIX
         # Correct directory permissions
         #
@@ -436,7 +441,7 @@ sub usage
 {
     xCAT::MsgUtils->message(
         'I',
-        "Usage:\nmysqlsetup - Performs the setup of MySQL for xCAT to use as its database. See man mysqlsetup for more information."
+        "Usage:\nmysqlsetup - Performs the setup of MySQL or MariaDB for xCAT to use as its database. See man mysqlsetup for more information."
         );
     my $msg =
       "mysqlsetup <-h|--help>\n           <-v|--version>\n           <-i|--init> [-f|hostfile] [-o|--odbc] [-L|--LL] [-V|--verbose]\n           <-u|--update> <-f|hostfile> [-o|--odbc] [-L|--LL] [-V|--verbose]\n           <-o|--odbc> [-V|--verbose]\n           <-L|--LL> [-V|--verbose]";
@@ -603,13 +608,16 @@ sub shutdownxcatd
     if ($::osname eq 'AIX')
     {
         $xcmd = "stopsrc -s xcatd";
+        system($xcmd);
 
     }
     else
     {
-        $xcmd = "service xcatd stop";
+        #$xcmd = "service xcatd stop";
+        my $ret=xCAT::Utils->stopservice("xcatd");
+        return $ret; 
     }
-    system($xcmd);
+
 }
 
 #-----------------------------------------------------------------------------
@@ -856,6 +864,7 @@ sub initmysqldb
 sub mysqlstart
 {
     my $cmd;
+    my $ret=0;
     if ($::osname eq 'AIX')
     {
         my $hostname = `hostname`;
@@ -867,22 +876,31 @@ sub mysqlstart
         $cmd = $cmd2;
         $cmd .=
           "$::installdir/bin/mysqld --user=mysql --basedir=$::installdir --datadir=/var/lib/mysql --user=mysql --log-error=/var/lib/mysql/$hostname.err --pid-file=/var/lib/mysql/$hostname.pid --socket=/tmp/mysql.sock --port=3306 &";
+        $ret=xCAT::Utils->runcmd($cmd, 0);
+        
+        
     }
     else
     {
-        if ($::linuxos =~ /rh.*/)
-        {
-            $cmd = "service mysqld start";
-        }
-        else
-        {    # sles
-            $cmd = "service mysql start";
-        }
+        if ($::MariaDB==1) {    # running MariaDB
+            #$cmd = "service mariadb start";
+            $ret=xCAT::Utils->startservice("mariadb");
+           
+        } else {   # it is mysql
+
+          if ($::linuxos =~ /rh.*/)
+          {
+            $ret=xCAT::Utils->startservice("mysqld");
+          }
+          else
+          {    # sles
+            $ret=xCAT::Utils->startservice("mysql");
+          }
+       }
     }
-    xCAT::Utils->runcmd($cmd, 0);
-    if ($::RUNCMD_RC != 0)
+    if ($ret != 0)
     {
-        xCAT::MsgUtils->message("E", " $cmd failed.");
+        xCAT::MsgUtils->message("E", " failed to start mysql/mariadb.");
         exit(1);
     }
 
@@ -973,16 +991,21 @@ sub mysqlreboot
     }
     else    # linux
     {
-        if ($::linuxos =~ /rh.*/)
-        {
-            $cmd = "chkconfig mysqld on";
-        }
-        else
-        {    # sles
-            $cmd = "chkconfig mysql on";
-            if ( $::debianflag ){
-                $cmd = "update-rc.d mysql defaults";
-            }
+        if ($::MariaDB==1 ) {  # MariaDB not MySQL
+         
+            $cmd = "chkconfig mariadb on";
+        } else { # mysql
+           if ($::linuxos =~ /rh.*/)
+           {
+              $cmd = "chkconfig mysqld on";
+           }
+           else
+           {    # sles
+              $cmd = "chkconfig mysql on";
+              if ( $::debianflag ){
+                  $cmd = "update-rc.d mysql defaults";
+              }
+           }
         }
         xCAT::Utils->runcmd($cmd, 0);
         if ($::RUNCMD_RC != 0)
@@ -1058,7 +1081,12 @@ sub setupxcatdb
     my $timeout  = 10;    # sets Expect default timeout, 0 accepts immediately
     my $pwd_sent = 0;
     my $pwd_prompt   = 'Enter password: ';
-    my $mysql_prompt = 'mysql> ';
+    my $mysql_prompt;
+    if ($::MariaDB == 1) {  # setup MariaDB
+     $mysql_prompt = 'MariaDB \[\(none\)\]> ';
+    } else {
+     $mysql_prompt = 'mysql> ';
+    }
     my $expect_log   = undef;
     my $debug        = 0;
     #if ($::VERBOSE)
@@ -1178,7 +1206,12 @@ sub setupLL
     my $timeout  = 10;    # sets Expect default timeout, 0 accepts immediately
     my $pwd_sent = 0;
     my $pwd_prompt   = 'Enter password: ';
-    my $mysql_prompt = 'mysql> ';
+    my $mysql_prompt;
+    if ($::MariaDB == 1) {  # setup MariaDB
+     $mysql_prompt = 'MariaDB \[\(none\)\]> ';
+    } else {
+     $mysql_prompt = 'mysql> ';
+    }
     my $expect_log   = undef;
     my $debug        = 0;
     #if ($::VERBOSE)
@@ -1308,7 +1341,12 @@ sub addhosts
     my $timeout  = 10;    # sets Expect default timeout, 0 accepts immediately
     my $pwd_sent = 0;
     my $pwd_prompt   = 'Enter password: ';
-    my $mysql_prompt = 'mysql> ';
+    my $mysql_prompt;
+    if ($::MariaDB == 1) {  # setup MariaDB
+     $mysql_prompt = 'MariaDB \[\(none\)\]> ';
+    } else {
+     $mysql_prompt = 'mysql> ';
+    }
     my $expect_log   = undef;
 
     foreach my $host (@hosts)
@@ -1749,7 +1787,7 @@ sub restorexcatdb
     # restore the database
     xCAT::MsgUtils->message(
         "I",
-        "Restoring the xCat Database with $::backupdir to MySQL database.\nThis could take several minutes."
+        "Restoring the xCAT Database with $::backupdir to MySQL database.\nThis could take several minutes."
         );
     if (!(-d $::backupdir))
     {    # does not exist, error
@@ -1778,12 +1816,14 @@ sub restorexcatdb
     if ($::osname eq 'AIX')
     {
         $xcmd = "$::XCATROOT/sbin/restartxcatd";
-
+        system($xcmd);
     }
     else
     {
-        $xcmd = "service xcatd restart";
+        #$xcmd = "service xcatd restart";
+        my $ret=xCAT::Utils->restartservice("xcatd");
+        return $ret;
     }
-    system($xcmd);
+
 }
 

xCAT-client/bin/pgsqlsetup

@@ -444,13 +444,16 @@ sub shutdownxcatd
     if ($::osname eq 'AIX')
     {
         $xcmd = "stopsrc -s xcatd";
+        system($xcmd);
 
     }
     else
     {
-        $xcmd = "service xcatd stop";
+       # $xcmd = "service xcatd stop";
+       my $ret=xCAT::Utils->stopservice("xcatd");
+       return $ret;
     }
-    system($xcmd);
+
 }
 
 #-----------------------------------------------------------------------------
@@ -832,6 +835,7 @@ sub initpgdb
 sub pgstart
 {
     my $cmd;
+    my $ret=0;
     xCAT::MsgUtils->message("I", "Starting the PosgreSQL Server");
     if ($::osname eq 'AIX')
     {
@@ -843,27 +847,35 @@ sub pgstart
     else    # linux
     {
         if (defined($::postgres9)) { # set to the PTF level of postgresql 9.X
-          $cmd = "service postgresql-9.$::postgres9 start";
+          #$cmd = "service postgresql-9.$::postgres9 start";
+          $cmd = "postgresql-9.$::postgres9";
         } else {
-          $cmd = "service postgresql start";
+          #$cmd = "service postgresql start";
+          $cmd = "postgresql";
         }
-        system($cmd);
-        if ($? > 0) {
-            xCAT::MsgUtils->message("E", " $cmd failed.");
+        #system($cmd)
+        #if ($? > 0) {
+        $ret=xCAT::Utils->startservice($cmd);
+        if ($ret != 0) {
+            xCAT::MsgUtils->message("E", " failed to start $cmd.");
             exit(1);
         }
         # check to see if running before continuing
         my $retries =0;
         my $pgstarted =0;
-        if (defined($::postgres9)) { # set to the PTF level of postgresql 9.X
-            $cmd = "service postgresql-9.$::postgres9 status";
-        } else {
-            $cmd = "service postgresql status";
-        }
+        #if (defined($::postgres9)) { # set to the PTF level of postgresql 9.X
+        #    #$cmd = "service postgresql-9.$::postgres9 status";
+        #    $ret=xCAT::Utils->checkservicestatus("postgresql-9.$::postgres9");
+        #} else {
+        #    #$cmd = "service postgresql status";
+        #    $ret=xCAT::Utils->checkservicestatus("postgresql");
+        #}
         while ($retries < 30) {
           $retries++;
-          my @status=xCAT::Utils->runcmd($cmd, -1);
-          if (grep(/[r|R]unning/, @status)) {
+          #my @status=xCAT::Utils->runcmd($cmd, -1);
+          #if (grep(/[r|R]unning/, @status)) {
+          $ret=xCAT::Utils->checkservicestatus($cmd);
+          if($ret == 0){ 
             $pgstarted=1;
             last;
           }
@@ -903,18 +915,22 @@ sub pgreboot
     else    # linux
     {
         if (defined($::postgres9)) { # set to the postgresql ptf level
-            $cmd = "chkconfig postgresql-9.$::postgres9 on";
+        #    $cmd = "chkconfig postgresql-9.$::postgres9 on";
+            $cmd = "postgresql-9.$::postgres9";
         } else {
-            $cmd = "chkconfig postgresql on";
+            #$cmd = "chkconfig postgresql on";
+            $cmd = "postgresql";
         }
-        if ($debianflag){
-            $cmd = "update-rc.d postgresql defaults";
-        }
-        xCAT::Utils->runcmd($cmd, 0);
-        if ($::RUNCMD_RC != 0)
+        #if ($debianflag){
+            #$cmd = "update-rc.d postgresql defaults";
+        #}
+        #xCAT::Utils->runcmd($cmd, 0);
+        #if ($::RUNCMD_RC != 0)
+        my $ret=xCAT::Utils->enableservice($cmd);
+        if($cmd !=0 )
         {
             xCAT::MsgUtils->message("E",
-                        " $cmd failed. PostgreSQL will not restart on reboot.");
+                        "enable service $cmd failed. PostgreSQL will not restart on reboot.");
         }
     }
 
@@ -1315,7 +1331,7 @@ sub restorexcatdb
     # restore the database
     xCAT::MsgUtils->message(
         "I",
-        "Restoring the xCat Database with $::backupdir to PostgreSQL database.\nThis could take several minutes."
+        "Restoring the xCAT Database with $::backupdir to PostgreSQL database.\nThis could take several minutes."
         );
     if (!(-d $::backupdir))
     {    # does not exist, error
@@ -1347,12 +1363,15 @@ sub restorexcatdb
     if ($::osname eq 'AIX')
     {
         $xcmd = "startsrc -s xcatd";
+        system($xcmd);
 
     }
     else
     {
-        $xcmd = "service xcatd start";
+        #$xcmd = "service xcatd start";
+        my $ret=xCAT::Utils->startservice("xcatd");
+        return $ret;
     }
-    system($xcmd);
+
 }
 

xCAT-client/bin/prsync

@@ -69,7 +69,7 @@ my $client = IO::Socket::SSL->new(
                 SSL_cert_file=>$homedir."/.xcat/client-cred.pem",
                 SSL_ca_file => $homedir."/.xcat/ca.pem",
                 SSL_use_cert => 1,
-                #SSL_verify_mode => 1,
+                SSL_verify_mode => 1,
              );
 die "Connection failure: $!\n" unless ($client);
 my %cmdref = (command => 'noderange', noderange => $noderange);

xCAT-client/bin/rcons

@@ -13,7 +13,7 @@ if [ "$os" == "AIX" ]; then
     export HOME
 fi
 
-if [ -z "$1" ] || [ "$1" = "-h"  ]; then
+if [ -z "$1" ] || [ "$1" = "-h"  ] || [ "$1" = "-help"  ] || [ "$1" = "--help"  ]; then
     echo "rcons - remotely accesses the serial console of a node"
     echo "rcons <singlenode> [conserver] [-f]"
     echo "rcons <singlenode> [conserver] [-s]"
@@ -66,14 +66,17 @@ if [ -f "/usr/bin/console" ] || [ -f "/bin/console" ]; then
 
     #Detect console support of SSL, only fixup consolerc if encryption is detected
     if ! console -h 2>&1 | grep "encryption not compiled" > /dev/null; then
-	if [ ! -f $HOME/.consolerc ]; then
-	    echo 'config * {' > $HOME/.consolerc
-	    echo "	port 782;" >> $HOME/.consolerc
-	    echo "	sslenabled yes;" >> $HOME/.consolerc
-	    echo "	sslauthority $HOME/.xcat/ca.pem;" >> $HOME/.consolerc
-	    echo "	sslcredentials $HOME/.xcat/client-cred.pem;" >> $HOME/.consolerc
-	    echo '}' >> $HOME/.consolerc
-	fi
+        # generate .consolerc if it does not exist or is empty
+        if [ ! -s $HOME/.consolerc ]; then
+            cat > $HOME/.consolerc << EOF
+config * {
+      port 782;
+      sslenabled yes;
+      sslauthority $HOME/.xcat/ca.pem;
+      sslcredentials $HOME/.xcat/client-cred.pem;
+}
+EOF
+        fi
     else
         # ssl is not enabled, comment out the ssl settings in .consolerc
 	if [ -f $HOME/.consolerc ]; then
@@ -115,7 +118,11 @@ else
         length=`expr $index2 - $index1`
         length=`expr $length - 1`
         cons_ip=`expr substr "$result" $pos $length`
-        ifconfig |grep "$cons_ip"
+        if [ "$os" == "AIX" ]; then
+          ifconfig |grep "$cons_ip"
+        else
+          ip addr |grep "$cons_ip"
+        fi
         if [ $? -eq 0 ]; then
            CONSERVER=""
         fi

xCAT-client/bin/rinstall

@@ -1,12 +1,11 @@
 #!/usr/bin/env perl 
 # IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
 
-# Used as a convience command combined of [nodech]-nodeset-rpower-[rcons/wcons] 
+# Used as a convience command combined of [nodech]-nodeset-rsetboot-rpower-[rcons/wcons] 
 # to make ease of node OS provision
 
-# To use this, sym link your cmd name to this script.
+# This is the client front-end to rinstall/winstall commands
 
-use strict;
 
 BEGIN
 {
@@ -20,180 +19,69 @@ use lib "$::XCATROOT/lib/perl";
 use File::Basename;
 use Getopt::Long;
 use xCAT::MsgUtils;
-use xCAT::Table;
-use xCAT::NodeRange;
+use xCAT::Utils;
+use xCAT::Client;
+use Cwd;
+use strict;
 
-
-sub usage {
-    print basename($0)." usage:\n";
-    print " ".basename($0)." [-o|--osver] [-p|--profile] [-a|--arch] [-O|--osimage] [-c|--console] <noderange>\n"
-}
-
-
-
-my $OSVER;
-my $PROFILE;
-my $ARCH;
-my $CONSOLE;
-my $OSIMAGE;
-
-Getopt::Long::Configure("bundling");
-unless (GetOptions(
-    'o|osver=s' => \$OSVER,
-    'p|profile=s' => \$PROFILE,
-    'a|arch=s' => \$ARCH,
-    'O|osimage=s' => \$OSIMAGE,
-    'c|console' => \$CONSOLE
-    )) {
-    usage;
-    exit 1;
-}
-my $arraysize=@ARGV;
-if ($arraysize > 1) {
-    print "noderange invalid\n";
-    usage;
-    exit 1;
-}
-if ($arraysize == 0) {
-    print "noderange not supplied\n";
-    usage;
-    exit 1;
-}
-
-my $noderange=@ARGV[0];
-my $rc=0;
-my %pnhash;
-my @allnodes;
-#use Data::Dumper;
-
-# check and complain about the invalid combination of the options,
-# called when -O is specified or nodetype.provmethod=<osimage>,
-# ignore -o,-p and -a options and prompt a warning message 
-sub checkoption{
-    my $optstring=shift;
-    if($OSVER)   {print 'warning: "'.$optstring.'" specified, "[-o|--osver] '.$OSVER."\" ignored\n"};
-    if($PROFILE) {print 'warning: "'.$optstring.'" specified, "[-p|--profile] '.$PROFILE."\" ignored\n"};
-    if($ARCH)    {print 'warning: "'.$optstring.'" specified, "[-a|--arch] '.$OSVER."\" ignored\n"};
-}
-
-
-@allnodes=noderange($noderange); 
-if($OSIMAGE){
-
-# -O|--osimage is specified, ignore any -a,-p,-o options,
-# call "nodeset ... osimage= ..." to set the boot state of the noderange to the specified osimage,
-# "nodeset" will handle the updating of node attributes such as os,arch,profile,provmethod
-
-   &checkoption("[-O|--osimage] $OSIMAGE");   
-   $rc=system("nodeset $noderange osimage=$OSIMAGE");
-   if ($rc) { 
-      xCAT::MsgUtils->message("E","nodeset failure");
-      exit 1;
-   };
-}else
+# build a request to go the rinstall plugin
+my $bname = basename($0);
+my $cmdref;
+$cmdref->{command}->[0] = $bname;
+$cmdref->{cwd}->[0] = cwd();
+# allows our plugins to get the stdin of the cmd that invoked the plugin
+my $data;
+if ( (($^O =~ /^linux/i) && ($ENV{'SHELL'} =~ /\/ksh$/))  || !defined($ENV{'TERM'}) )
 {
-
-# no osimage specified, update the node attributes specified by -a,-p,-o options thru "nodech",
-# then set the boot state of each node based on the nodetype.provmethod:
-# 1) if nodetype.provmethod = <osimage>, ignore any -p,-o,-a option, then call "nodeset ... osimage" 
-# 2) if nodetype.provmethod = [install/netboot/statelite], update the node attributes specified by -a,-p,-o options thru "nodech", call "nodeset ... [install/netboot/statelite]"
-# 3) if nodetype.provmethod is not set, use 'install' as the default value
-
-# group the nodes according to the nodetype.provmethod
-
-   foreach(@allnodes){
-      my $tab=xCAT::Table->new("nodetype");
-      my $nthash=$tab->getNodeAttribs($_,['provmethod']);
-      $tab->close();
-      if(defined($nthash) and defined($nthash->{'provmethod'}))
-      {
-        push(@{$pnhash{$nthash->{'provmethod'}}},$_);
-      }
-      else
-      {
-        #if nodetype.provmethod is not specified,
-        push(@{$pnhash{'install'}},$_);
-      }
-   }
-
-   
-   foreach  my $key (keys %pnhash)
-   {
-      my $rclocal=0;
-      my $nodes=join(',',@{$pnhash{$key}});
-      if($key =~ /^(install|netboot|statelite)$/)
-      {
-
-         # nodetype.provmethod = [install|netboot|statelite]
-         my $nodechline = "";
-         if ($OSVER) {
-            $nodechline = "nodetype.os=$OSVER";
-         }
-         if ($PROFILE) {
-            $nodechline .= " nodetype.profile=$PROFILE";
-         }
-         if ($ARCH) {
-            $nodechline .= " nodetype.arch=$ARCH";
-         }
-         if ($nodechline) {
-            $rclocal=system("nodech $nodes $nodechline");
-            if ($rclocal) { 
-               print "nodech failure\n";
-               $rc=$rclocal;
-            }
-         }
-
-         unless($rc){ 
-            $rclocal=system("nodeset $nodes $key");
-            if ($rclocal) { 
-               print "nodeset $nodes failure\n";
-               $rc=$rclocal;
-            }
-         }
-      }
-      else
-      {   
-
-         # nodetype.provmethod = <osimage>
-         &checkoption("nodetype.provmethod=$key");   
-         $rclocal=system("nodeset $nodes osimage");
-         if ($rclocal) { 
-            print "nodeset $nodes failure\n";
-            $rc=$rclocal;
-         }
-      }
-      
-   }
+    my $rin="";
+    my $rout;
+    vec($rin,fileno(STDIN),1)=1;
+    my $nfound=select($rout=$rin,"","",1);
+    if ($nfound)
+    {
+        while ( <STDIN> ) { $data.=$_; }
+        $cmdref->{stdin}->[0]=$data;
+    }
 }
-
-if($rc){
-      xCAT::MsgUtils->message("E","nodeset failure");
-      exit 1;
+else
+{
+    if (-p STDIN) {
+        while ( <STDIN> ) { $data.=$_; }
+        $cmdref->{stdin}->[0]=$data;
+    }
 }
+my $arg;
+my @tmpargv = @ARGV;
+# first
+$arg=shift(@ARGV);
+# first  1st non-hyphen arg is the noderange
+while ($arg =~ /^-/) {
+        push (@{$cmdref->{arg}}, $arg);
+        $arg=shift(@ARGV);
+}
+$cmdref->{noderange}->[0]=$arg;
+push (@{$cmdref->{arg}}, @ARGV);
 
-# call "rsetboot" to set the boot order of the nodehm.mgt=ipmi nodes,for others, assume user has set the correct boot order before "rinstall"
-system("rsetboot $noderange net");
+my $noderange=$cmdref->{noderange}->[0];  # save the noderange
 
-# call "rpower" to start the node provision process
-$rc=system("rpower $noderange boot");
-if ($rc) {
-    xCAT::MsgUtils->message("E","rpower failure");
-    exit 1;
-};
+# ok call Client to run the plugin rinstall.pm
+xCAT::Client::submit_request($cmdref,\&xCAT::Client::handle_response);
 
+if ($xCAT::Client::EXITCODE == 0)  # no errors
+{
+ my $startconsole=$cmdref->{startconsole}->[0];
+ # if startconsole requested ( -c flag) for rinstall always for winstall
+ # This is set in the rinstall plugin
+ if ($startconsole == 1) {
+   if (basename($0) =~ /rinstall/) {
 
-if (basename($0) =~ /rinstall/) {
-
-# for rinstall, the -c|--console option can provide the remote console for only 1 node
-    if ($CONSOLE) {
-        if(scalar @allnodes ne 1){
-	    xCAT::MsgUtils->message("E","rinstall [-c|--console] will only work if there is only one node in the noderange. See winstall(8) for consoles on multiple systems");
-            exit 1;
-        }
         exec("rcons $noderange");
     }
-} elsif (basename($0) =~ /winstall/) {
-# winstall can commence a wcons command to the noderange for monitoring the provision cycle
+    elsif (basename($0) =~ /winstall/) {
+       # winstall can commence a wcons command to the noderange for monitoring the provision cycle
 
-    exec("wcons $noderange");
+       exec("wcons $noderange");
+    }
+ }
 }
+exit $xCAT::Client::EXITCODE;

xCAT-client/pods/man1/chvm.1.pod

@@ -23,8 +23,10 @@ B<chvm> I<noderange> I<--p775> B<-i id> [B<-m> I<memory_interleaving>] B<-r> I<p
 B<chvm> I<noderange> [B<lparname>={B<*>|B<name>}]
 
 B<chvm> I<noderange> [B<vmcpus=min/req/max>] [B<vmmemory=min/req/max>]
-               [B<vmphyslots=drc_index1,drc_index2...>] [B<vmothersetting=hugepage:N,bsr:N>]
-               [B<vmnics=vlan1[,vlan2..]]> [B<vmstorage=<N|viosnode:slotid>>] [B<--vios>]
+               [B<vmothersetting=hugepage:N,bsr:N>]
+               [B<add_physlots=drc_index1,drc_index2...>]
+               [B<add_vmnics=vlan1[,vlan2..]]> [B<add_vmstorage=<N|viosnode:slotid>>] [B<--vios>]
+               [B<del_physlots=drc_index1,drc_index2...>]
                [B<del_vadapter=slotid>]
                
 =head2 VMware/KVM specific:
@@ -113,7 +115,7 @@ The administrator should use lsvm to get the profile content, and then edit the
 
 For normal power machine:
 
-chvm could be used to modify the resources assigned to partitions. The admin shall specify the attributes with options I<vmcpus>, I<vmmemory>, I<vmphyslots>, I<vmothersetting>, I<vmnics> and/or I<vmstorage>. If nothing specified, nothing will be returned. 
+chvm could be used to modify the resources assigned to partitions. The admin shall specify the attributes with options I<vmcpus>, I<vmmemory>, I<add_physlots>, I<vmothersetting>, I<add_vmnics> and/or I<add_vmstorage>. If nothing specified, nothing will be returned. 
 
 =head2 VMware/KVM specific:
 
@@ -197,17 +199,21 @@ Name of I/O slots assignment profile. Shall work with option B<--p775>.
 
 Set LPAR name for the specified lpars. If '*' specified, it means to get names from xCAT database and then set them for the specified lpars. If a string is specified, it only supports single node and the string will be set for the specified lpar. The user can use lsvm to check the lparnames for lpars. 
 
-=item B<vmcpus=value> B<vmmemory=value> B<vmphyslots=value> B<vmothersetting=value>
+=item B<vmcpus=value> B<vmmemory=value> B<add_physlots=value> B<vmothersetting=value>
 
 To specify the parameters that will be modified.
 
-=item B<vmnics=value> B<vmstorage=value> [B<--vios>]
+=item B<add_vmnics=value> B<add_vmstorage=value> [B<--vios>]
 
 To create new virtual adapter for the specified node. 
 
-=item B<del_vadapter=value>
+=item B<del_physlots=drc_index1,drc_index2...>
 
-To specify the slot id of the virtual adapter will be deleted.
+To delete physical slots which are specified by the I<drc_index1,drc_index2...>.
+
+=item B<del_vadapter=slotid>
+
+To delete a virtual adapter specified by the I<slotid>.
 
 =back
 
@@ -504,7 +510,7 @@ The output is similar to:
 
 To modify the resource assignment:
 
- chvm lpar1 vmcpus=1/2/16 vmmemory=1G/8G/32G vmphyslots=0x21010202
+ chvm lpar1 vmcpus=1/2/16 vmmemory=1G/8G/32G add_physlots=0x21010202
 
 The output is similar to:
  
@@ -526,7 +532,7 @@ The resource information after modification is similar to:
  lpar1: 1/2/2
  lpar1: 128.
 
-Note: The physical I/O resources specified with I<vmphyslots> will be appended to the specified partition. The physical I/O resources which are not specified but belonged to the partition will not be removed. For more information about I<vmphyslots>, please refer to L<lsvm(1)|lsvm.1>.  
+Note: The physical I/O resources specified with I<add_physlots> will be appended to the specified partition. The physical I/O resources which are not specified but belonged to the partition will not be removed. For more information about I<add_physlots>, please refer to L<lsvm(1)|lsvm.1>.  
 
 =head2 VMware/KVM specific:
 

xCAT-client/pods/man1/configfpc.1.pod

@@ -24,8 +24,8 @@ The B<configfpc> command discovers the FPCs and collects the MAC address. The MA
 
 This process is repeated until no more FPCs are discovered. 
 
-For more information on xCAT support of NeXtScale and configfpc see:
-https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_NeXtScale_Clusters
+For more information on xCAT support of NeXtScale and configfpc see the following doc:
+XCAT_NeXtScale_Clusters
 
 =head1 OPTIONS
 

xCAT-client/pods/man1/db2sqlsetup.1.pod

@@ -24,7 +24,7 @@ The xcatd daemon will be stopped during migration on the MN.  No xCAT commands s
 
 The db2sqlsetup script must be  run on each Service Node, after the DB2 Client code has been installed, to setup the DB2 Client (-C). There are two postscripts that are provided ( db2install and odbcsetup) that will automatically setup you Service Node  as a DB2 client. 
 
-For full information on the setup of DB2,  see http://sourceforge.net/apps/mediawiki/xcat/index.php?title=Setting_Up_DB2_as_the_xCAT_DB.
+For full information on the setup of DB2,  see the following doc: Setting_Up_DB2_as_the_xCAT_DB.
 
 When running of db2sqlsetup on the MN:
 One password must be supplied for the setup,  a password for the xcatdb unix id which will be used as the DB2 instance id and database name.  The password will be prompted for interactively or can be input with the XCATDB2PW  environment variable.

xCAT-client/pods/man1/geninitrd.1.pod

@@ -38,7 +38,7 @@ B<osupdatename> - comma separated 'osdistroupdate' object. Each 'osdistroupdate'
 Linux distro update. When run geninitrd, 'kernel-*.rpm' will be searched from osdistroupdate.dirpath 
 to get all the rpm packages and then search the drivers from the rpm packages. 
 
-Refer to the doc: https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Using_Linux_Driver_Update_Disk
+Refer to the doc: Using_Linux_Driver_Update_Disk
 
 =back
 

xCAT-client/pods/man1/getmacs.1.pod

@@ -26,10 +26,14 @@ The getmacs command collects MAC address from a single or range of nodes.
 Note that on AIX systems, the returned MAC address is not colon-seperated (for example 8ee2245cf004), while on Linux systems the MAC address is colon-seperated (for example 8e:e2:24:5c:f0:04).
 If no ping test performed,  getmacs writes the first adapter MAC to the xCAT database.  If ping test performed, getmacs will write the first successfully pinged MAC to xCAT database.
 
-For PPC (without HMC, using Direct FSP Management) specific:
+For PPC (using Direct FSP Management) specific:
 
 Note: If network adapters are physically assigned to LPARs, getmacs cannot read the MAC addresses unless perform ping test, since there is no HMC command to read them and getmacs has to login to open formware. And if the LPARs has never been activated before, getmacs need to be performed with the option "B<-D>" to get theirs MAC addresses.
 
+For PPC (using HMC) specific:
+
+Note: The option "B<-D>" B<must> be used to get MAC addresses of LPARs.
+
 For IBM Flex Compute Node (Compute Node for short) specific:
 
 Note: If "B<-d>" is specified, all the MAC of the blades will be displayed. If no option specified, the first MAC address of the blade will be written to mac table.

xCAT-client/pods/man1/getxcatdocs.1.pod

@@ -4,19 +4,23 @@ B<getxcatdocs> - downloads the xCAT documentation and converts to HTML and PDF
 
 =head1 SYNOPSIS
 
-B<getxcatdocs> [B<-?> | B<-h> | B<--help> | B<-v> | B<--version>] [I<destination-dir>]
+B<getxcatdocs> [B<-?> | B<-h> | B<--help>]
+B<getxcatdocs> [B<-v> | B<--verbose>] [I<destination-dir>]
+B<getxcatdocs> [B<-v> | B<--verbose>] [B<-d> | B<--doc> I<single_doc>] [I<destination-dir>]
 
 =head1 DESCRIPTION
 
 The B<getxcatdocs> command downloads the xCAT documentation from the wiki and converts it to both HTML and PDF.
 This enables reading the documentation when you do not have internet access.  Note that this command does not
-download/convert the entire xCAT wiki - only the "official" xCAT documentation linked from https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_Documentation .
+download/convert the entire xCAT wiki - only the "official" xCAT documentation linked from http://sourceforge.net/p/xcat/wiki/XCAT_Documentation.
 
-If I<destination-dir> is specified, B<getxcatdocs> will put the converted documentation in that directory, in 2 sub-directories: html, pdf.
-Otherwise, it will put it in the current directory (in the same two sub-directories).
+If I<destination-dir> is specified, B<getxcatdocs> will put the converted documentation in that directory, in 3 sub-directories: html, pdf, images.
+Otherwise, it will put it in the current directory (in the same three sub-directories).
 
-B<getxcatdocs> uses wget to do the download the documents and xhtml2pdf to convert them to PDF.  To install xhtml2pdf, see: 
-https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Editing_xCAT_Documentation_Pages#Converting_Wiki_Pages_to_HTML_and_PDFs .
+If B<--doc> I<single_doc> is specified, only that one wiki page will be downloaded and converted.  
+
+B<getxcatdocs> uses curl to run the Allura wiki API to download the document markdown text, and Pandoc with LaTex them to PDF.  You must have all of these functions installed to run B<getxcatdocs>.  See:
+http://sourceforge.net/p/xcat/wiki/Editing_and_Downloading_xCAT_Documentation/#converting-wiki-pages-to-html-and-pdfs 
 
 =head2 Limitations:
 
@@ -26,24 +30,24 @@ https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Editing_xCAT_Documen
 
 This command does not run on AIX or Windows.
 
-=item *
-
-The conversion to HTML does not yet honor the xCAT wiki style sheet.
-
 =back
 
 =head1 OPTIONS
 
 =over 10
 
-=item B<-v|--version>
+=item B<-v|--verbose>
 
-Command Version.
+Run the command in verbose mode.
 
 =item B<-?|-h|--help>
 
 Display usage message.
 
+=item B<-d|--doc> I<single_doc>
+
+Run this command for a single document only.  If you get errors about Official-xcat-doc.png not found, either download this image directly from http://sourceforge.net/p/xcat/wiki/XCAT_Documentation/attachment/Official-xcat-doc.png or run B<getxcatdocs -d XCAT_Documentation> first.
+
 =back
 
 =head1 RETURN VALUE

xCAT-client/pods/man1/lsvm.1.pod

@@ -41,8 +41,8 @@ The Memory Interleaving Mode has 3 valid options:
   1 - interleaved
   2 - non-interleaved
 
-More information about this part, refer to the section Using the *vm commands to define partitions in xCAT DFM  in the link below. 
-  https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_Power_775_Hardware_Management
+More information about this part, refer to the section Using the *vm commands to define partitions in xCAT DFM  in the following doc: 
+  XCAT_Power_775_Hardware_Management
 
 =head2 For KVM and Vmware
 

xCAT-client/pods/man1/lsxcatd.1.pod

@@ -68,13 +68,13 @@ To display all information:
 
 Output is similar to: 
 
-Version 2.7 (svn r, built Tue Jan 17 15:16:33 EST 2012)
- This is a Management Node
- cfgloc=mysql:dbname=xcatdb;host=10.6.0.1|xcatadmin
- dbengine=mysql
- dbname=xcatdb
- dbhost=10.6.0.1
- dbadmin=xcatadmin
+Version 2.8.5 (git commit 0d4888af5a7a96ed521cb0e32e2c918a9d13d7cc, built Tue Jul 29 02:22:47 EDT 2014)
+This is a Management Node
+cfgloc=mysql:dbname=xcatdb;host=9.114.34.44|xcatadmin
+dbengine=mysql
+dbname=xcatdb
+dbhost=9.114.34.44
+dbadmin=xcatadmin
 
 
 =back

xCAT-client/pods/man1/mysqlsetup.1.pod

@@ -1,6 +1,6 @@
 =head1 NAME
 
-B<mysqlsetup> - Sets up the MySQL database for xCAT to use.  
+B<mysqlsetup> - Sets up the MySQL or MariaDB database for xCAT to use.  
 
 =head1 SYNOPSIS
 
@@ -19,9 +19,10 @@ B<mysqlsetup> {B<-L>|B<--LL>} [-V|--verbose]
 
 =head1 DESCRIPTION
 
-B<mysqlsetup> - Sets up the MySQL database for xCAT to use. The mysqlsetup script is run on the Management Node as root after the MySQL code has been installed. Before running the init option, the MySQL server should be stopped.  The xCAT daemon, xcatd, must be running, do not stop it. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to MySQL and restarting the xcatd daemon as well as the MySQL daemon. For full information on all the steps that will be done, read the "Configure MySQL and Migrate xCAT Data to MySQL" sections in 
-https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Setting_Up_MySQL_as_the_xCAT_DB
+B<mysqlsetup> - Sets up the MySQL or MariaDB database (linux only for MariaDB) for xCAT to use. The mysqlsetup script is run on the Management Node as root after the MySQL code or MariaDB code has been installed. Before running the init option, the MySQL server should be stopped, if it is running.  The xCAT daemon, xcatd, must be running, do not stop it. No xCAT commands should be run during the init process, because we will be migrating the xCAT database to MySQL or MariaDB and restarting the xcatd daemon as well as the MySQL daemon. For full information on all the steps that will be done, read the "Configure MySQL and Migrate xCAT Data to MySQL" sections in 
+Setting_Up_MySQL_as_the_xCAT_DB
 Two passwords must be supplied for the setup,  a password for the xcatadmin id and a password for the root id in the MySQL database.  These will be prompted for interactively, unless the environment variables XCATMYSQLADMIN_PW and  XCATMYSQLROOT_PW are set to the passwords for the xcatadmin id and root id in the database,resp. 
+Note below we refer to MySQL but it works the same for MariaDB.
 
 =head1 OPTIONS
 
@@ -41,8 +42,8 @@ Displays verbose messages.
 
 =item B<-i|--init>
 
-The init option is used to setup an installed MySQL database so that xCAT can use the database.  This involves creating the xcatdb database, the xcatadmin id, allowing access to the xcatdb database by the Management Node. It customizes the my.cnf configuration file for xcat and starts the MySQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb MySQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the MySQL database and restarts the xcatd daemon using the database. 
-On AIX, it additionally setup the mysql id and group and corrects the permissions in the MySQL install directories. For AIX, you should be using the MySQL rpms available from the xCAT website. For Linux, you should use the MySQL rpms shipped with the OS. You can chose the -f and/or the -o option, to run after the init. 
+The init option is used to setup a xCAT database on an installed MySQL or MariaDB server for xCAT to use. The mysqlsetup script will check for the installed MariaDB server rpm first and will use MariaDB if it is installed.   This involves creating the xcatdb database, the xcatadmin id, allowing access to the xcatdb database by the Management Node. It customizes the my.cnf configuration file for xcat and starts the MySQL server.  It also backs up the current xCAT database and restores it into the newly setup xcatdb MySQL database.  It creates the /etc/xcat/cfgloc file to point the xcatd daemon to the MySQL database and restarts the xcatd daemon using the database. 
+On AIX, it additionally setup the mysql id and group and corrects the permissions in the MySQL install directories. For AIX, you should be using the MySQL rpms available from the xCAT website. For Linux, you should use the MySQL or MariaDB rpms shipped with the OS. You can chose the -f and/or the -o option, to run after the init. 
 
 =item B<-u|--update>
 
@@ -56,13 +57,13 @@ This option runs during update, it will take all the host from the input file (p
 
 This option sets up the ODBC  /etc/../odbcinst.ini, /etc/../odbc.ini and the .odbc.ini file in roots home directory will be created and initialized to run off the xcatdb MySQL database.
 See "Add ODBC Support" in
-https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Setting_Up_MySQL_as_the_xCAT_DB
+Setting_Up_MySQL_as_the_xCAT_DB
 
 =item B<-L|--LL>
 
 Additional database configuration specifically for the LoadLeveler product. 
 See "Add ODBC Support" in
-https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Setting_Up_MySQL_as_the_xCAT_DB
+Setting_Up_MySQL_as_the_xCAT_DB
 
 =back
 

xCAT-client/pods/man1/nodeimport.1.pod

@@ -120,8 +120,7 @@ To import nodes using a profile, follow the following steps:
   # hostinfo begin
   # This entry defines a blade.
   __hostname__:
-     switch=myswitch 
-     switchport=9
+     switches=eth0!switch1!1,eth0!switch2!1!eth1
 
   Example of a node information file that specifies a CEC-based rack-mounted Power node that uses direct FSP management:
   # Node information file begins
@@ -129,6 +128,11 @@ To import nodes using a profile, follow the following steps:
   __hostname__:
      mac=b8:ac:6f:37:59:28
      cec=mycec
+  
+  __hostname__:
+     mac=b8:ac:6f:37:59:29
+     cec=mycec
+     lpaid=2
   # Node information file ends.
 
 The node information file includes the following items:
@@ -141,13 +145,9 @@ B<mac=<mac-address>>  This is a mandatory item.
 
 Description: Specify the MAC address for the NIC used by the provisionging node, where <mac-address> is the NICs MAC address.
 
-B<switch=<switch-name>>  This is a mandatory item, when define a switch auto discovery node.
+B<switches=<nic-name!switch-name!switch-port>>  This is a mandatory item, when define switch, switchport and node nic name relationship.
 
-Description: Specify switch name that the provisionging node is connected, where <switch-name> is the switch name.
-
-B<switchport=<switch-port>>  This is a mandatory item, when define a switch auto discovery node.
-
-Description: Specify switch port that the provisionging node is connected, where <switch-port> is the connected port.
+Description: Specify nic name, switch name and switch port to define node and switch relationship. We can define multi nic-switch-port relations here, looks like: switches=eth0!switch1!1,eth1!switch1,2
 
 B<slotid=<slot-id>>  This is a mandatory item while define a PureFlex node.
 
@@ -157,6 +157,10 @@ B<cec=<cec-name>>  This is a mandatory option for defining Power rack-mounted no
 
 Description: Specifies the name of a Power rack-mount central electronic complex (CEC).
 
+B<lparid=<lpar-id>>  This is a optional option for defining Power rack-mounted nodes.
+
+Description: Specifies the LPAR ID of a Power rack-mounted node, where <lpar-id> is the ID number. The default value is 1 if it is not defined.
+
 B<ip=<ip-address>> This is an optional item.
 
 Description: Specify the IP address used for provisioning a node, where <ip-address> is in the form xxx.xxx.xxx.xxx. If this item is not included, the IP address used to provision the node is generated automatically according to the Network Profile used by the node.

xCAT-client/pods/man1/pgsqlsetup.1.pod

@@ -40,7 +40,7 @@ The init option is used to setup an installed PostgreSQL database so that xCAT c
 On AIX, it additionally setup the xcatadm unix id and the postgres id and group. For AIX, you should be using the PostgreSQL rpms available from the xCAT website. For Linux, you should use the PostgreSQL rpms shipped with the OS. You can chose the -o option, to run after the init.
 To add additional nodes to access the PostgreSQL server, setup on the Management Node,  edit the pg_hba.conf file.   
 
-For more documentation see:https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Setting_Up_PostgreSQL_as_the_xCAT_DB
+For more documentation see the following documentation: Setting_Up_PostgreSQL_as_the_xCAT_DB
 
 =item B<-N|--nostart>
 

xCAT-client/pods/man1/rflash.1.pod

@@ -60,8 +60,8 @@ If it outputs B<"Timeout waiting for prompt"> during the upgrade, please set the
 
 In currently Direct FSP/BPA Management, our B<rflash> doesn't support B<concurrent> value of B<--activate> flag, and supports B<disruptive> and B<deferred>. The B<disruptive> option will cause any affected systems that are powered on to be powered down before installing and activating the update. So we require that the systems should be powered off before do the firmware update. 
 
-The B<deferred> option will load the new firmware into the T (temp) side, but will not activate it like the disruptive firmware. The customer will continue to run the Frames and CECs working with the P (perm) side and can wait for a maintenance window where they can activate and boot the Frame/CECs with new firmware levels. Refer to the link to get more details:
-  https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_Power_775_Hardware_Management#Perform_Deferred_Firmware_upgrades_for_frame.2FCEC_on_Power_775
+The B<deferred> option will load the new firmware into the T (temp) side, but will not activate it like the disruptive firmware. The customer will continue to run the Frames and CECs working with the P (perm) side and can wait for a maintenance window where they can activate and boot the Frame/CECs with new firmware levels. Refer to the following documentation to get more details:
+  XCAT_Power_775_Hardware_Management#Perform_Deferred_Firmware_upgrades_for_frame.2FCEC_on_Power_775
 
 In Direct FSP/BPA Management, there is -d <data_directory> option. The default value is /tmp. When do firmware update, rflash will put some related data from rpm packages in <data_directory> directory, so the execution of rflash will require available disk space in <data_directory> for the command to properly execute: 
 
@@ -71,12 +71,12 @@ For one GFW rpm package and one power code rpm package , if the GFW rpm package
 For Power 775, the rflash command takes effect on the primary and secondary FSPs or BPAs almost in parallel. 
 
 For more details about the Firmware Update using Direct FSP/BPA Management, refer to:
-  https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_Power_775_Hardware_Management#Updating_the_BPA_and_FSP_firmware_using_xCAT_DFM
+  XCAT_Power_775_Hardware_Management
 
 =head2 NeXtScale FPC specific:
 
-The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. The http imformation required includes both the MN IP address as well as the directory containing the firmware. It is recommended that the firmware be downloaded and placed in the /install directory structure as the xCAT MN /install directory is configured with the correct permissions for http.  Refer to the link to get more details:
- https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_NeXtScale_Clusters#Update_the_FPC_firmware_.28optional.29 
+The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware. The http imformation required includes both the MN IP address as well as the directory containing the firmware. It is recommended that the firmware be downloaded and placed in the /install directory structure as the xCAT MN /install directory is configured with the correct permissions for http.  Refer to the doc to get more details:
+XCAT_NeXtScale_Clusters 
 
 
 =head1 B<Options>

xCAT-client/pods/man1/rinv.1.pod

@@ -96,7 +96,7 @@ Retrieves deconfigured resources. Deconfigured resources are hw components (cpus
 
 =item B<-x>
 
-To output the information of deconfigured resources in XML format.
+To output the raw information of deconfigured resources for CEC.
 
 =item B<asset>
 
@@ -223,7 +223,7 @@ To retrieve all information available from blade node4, enter:
 
 =item *
 
-To output the information of deconfigured resources in XML format for CEC cec01, enter:
+To output the raw information of deconfigured resources for CEC cec01, enter:
 
  rinv cec01 deconfig -x
 

xCAT-client/pods/man1/rnetboot.1.pod

@@ -8,6 +8,8 @@ B<rnetboot> [B<-V>|B<--verbose>] [B<-s> I<boot_device_order>] [B<-F>] [B<-f>] I<
 
 B<rnetboot> [B<-h>|B<--help>] [B<-v>|B<--version>]
 
+=head2 zVM specific:
+
 B<rnetboot> noderange [B<ipl=> I<address>]
 
 

xCAT-client/pods/man1/rpower.1.pod

@@ -16,17 +16,19 @@ B<rpower> I<noderange> [B<on>|B<off>|B<softoff>|B<reset>|B<boot>|B<stat>|B<state
 
 B<rpower> I<noderange> [B<--nodeps>] {B<of>}
 
-=head2 PPC (with HMC) specific:
+=head2 CEC (with HMC) specific:
 
-B<rpower> I<noderange> [B<onstandby>]
+B<rpower> I<noderange> [B<on>|B<off>|B<reset>|B<boot>|B<onstandby>]
 
-B<rpower> I<noderange> [B<softoff>]
+=head2 LPAR (with HMC) specific:
+
+B<rpower> I<noderange> [B<on>|B<off>|B<stat>|B<state>|B<reset>|B<boot>|B<of>|B<sms>|B<softoff>]
 
 =head2 CEC (using Direct FSP Management) specific:
 
 B<rpower> I<noderange> [B<onstandby>|B<stat>|B<state>] [B<-T tooltype>]
 
-B<rpower> I<noderange> [B<on>|B<off>|B<lowpower>|B<resetsp>]
+B<rpower> I<noderange> [B<on>|B<off>|B<resetsp>]
 
 =head2 Frame (using Direct FSP Management) specific:
 
@@ -64,10 +66,6 @@ Turn power on to standby state
 
 The value could be B<lpar> or B<fnm>. The tooltype value B<lpar> is for xCAT and B<fnm> is for CNM. The default value is "B<lpar>". For cold start in the large cluster, it will save a lot of time if the admins use "B<rpower> I<noderange> B<onstandby> B<-T> B<fnm>" to power on all the CECs from the management node through the B<fnm> connections.
 
-=item B<lowpower>
-
-Turn CEC to low power state (state EOCT). This is a disruptive operation which requires the CEC to be powered off prior to entering low power mode. And we can use power off command to get out of lowepower state.
-
 =item B<rackstandby>
 
 Places the rack in the rack standby state. It requires that all CECs and DE be powered off before it will run.

xCAT-client/pods/man1/updatenode.1.pod

@@ -89,7 +89,7 @@ Files may be distributed and synchronized for both diskless and
 diskfull nodes.  Syncing files to NFS-based statelite nodes is not supported. 
 
 More information on using the  synchronization file function is in  
-https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Using_Updatenode.
+ the following doc: Using_Updatenode.
 
 =head3 Create the synclist file
 
@@ -100,7 +100,7 @@ and the destination location for the files on the target node.
 
 For more information on creating your synclist files and where to put them, read:
 
-http://sourceforge.net/apps/mediawiki/xcat/index.php?title=Sync-ing_Config_Files_to_Nodes
+Sync-ing_Config_Files_to_Nodes
 
 
 =head3 Run updatenode to synchronize the files
@@ -111,7 +111,7 @@ http://sourceforge.net/apps/mediawiki/xcat/index.php?title=Sync-ing_Config_Files
 =head2 To install or update software
 
 updatenode can be use to install or update software on the nodes. See the following documentation for setting up otherpkgs:
-https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Install_Additional_Packages
+Install_Additional_Packages
 
 To install/update the packages, run:
 
@@ -136,11 +136,14 @@ B<For AIX systems:>
 Note: The updatenode command is used to update AIX diskfull nodes only. For updating diskless AIX nodes refer to the xCAT for AIX update documentation and use the xCAT mknimimage command.
 For information on updating software on AIX cluster:
 For diskful installs, read:
-https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_AIX_RTE_Diskfull_Nodes
+XCAT_AIX_RTE_Diskfull_Nodes
 For diskless installs, read:
-https://sourceforge.net/apps/mediawiki/xcat/index.php?title=XCAT_AIX_Diskless_Nodes
+XCAT_AIX_Diskless_Nodes
 
+updatenode can also be used in Sysclone environment to push delta changes to target node. After capturing the delta changes from the golden client to management node, just run below command to push delta changes to target nodes.
 
+  updatenode <targetnoderange> -S
+  
 =head2 To run postscripts
 
 The scripts must be copied to the /install/postscripts 
@@ -342,7 +345,8 @@ Display usage message.
 =item B<-k|--security>
 
 Update the ssh keys and host keys for the service nodes and compute nodes;
-Update the ca and credentials to the service nodes.  Never run this command to the Management Node, it will take down xcatd. 
+Update the ca and credentials to the service nodes.  Never run this command to the Management Node, it will take down xcatd.
+You must be running updatenode as root to use the -k flag. 
 
 =item B<-l>|B<--user> I<user_ID>
 
@@ -362,7 +366,7 @@ be run during install.  You should use updatenode <noderange> -F instead.
 
 =item B<-S|--sw>
 
-Specifies that node software should be updated. 
+Specifies that node software should be updated.  In Sysclone environment, specifies pushing the delta changes to target nodes.
 
 =item B<-s|--sn>
 
@@ -567,6 +571,12 @@ See  Granting_Users_xCAT_privileges for required sudo setup.
 
 B<updatenode node1 -l user1 -P syslog>
 
+=item 22
+
+In Sysclone environment, after capturing the delta changes from golden client to management node, to run updatenode to push these delta changes to target nodes.
+
+B<updatenode target-node -S>
+
 
 =back
 

xCAT-client/pods/man1/xdcp.1.pod

@@ -205,7 +205,7 @@ For example, your rsynclist file may look like this:
 
 Note: no order can be assumed by the order that the EXECUTE,EXECUTEALWAYS and APPEND clause fall in the synclist file. 
 
-For more information on syncing files to node, read https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Sync-ing_Config_Files_to_Nodes
+For more information on syncing files to node, read Sync-ing_Config_Files_to_Nodes
 
 On Linux rsync always uses ssh remoteshell. On AIX, ssh or rsh is used depending on the site.useSSHonAIX attribute.
 

xCAT-client/pods/man8/copycds.8.pod

@@ -91,6 +91,16 @@ Output will be similar to:
 
 For the attributes that are not recognized, the value will be blank.
 
+=item *
+
+To copy the packages from a supplemental DVD ISO file:
+
+ copycds -n /isodir/RHEL6.5/RHEL6.5-Supplementary-20131114.2-Server-ppc64-DVD1.iso -n rhels6.5-supp
+
+Also, remember to add the new directory to your osimage definition:
+
+ chdef -t osimage myosimage -p pkgdir=/install/rhels6.5-supp/ppc64
+
 =back
  
 =head1 SEE ALSO

xCAT-client/pods/man8/makeconservercf.8.pod

@@ -6,9 +6,9 @@ B<makeconservercf> - creates the conserver configuration file from info in the x
 
 B<makeconservercf> [B<-V|--verbose>] [B<-d|--delete>] I<noderange>
 
-B<makeconservercf> [B<-V|--verbose>] [B<-l|--local>]
+B<makeconservercf> [B<-V|--verbose>] [B<-l|--local>] [I<noderange>]
 
-B<makeconservercf> [B<-V|--verbose>] [B<-c|--conserver>] I<noderange>
+B<makeconservercf> [B<-V|--verbose>] [B<-c|--conserver>] [I<noderange>]
 
 B<makeconservercf> [B<-V|--verbose>] I<noderange> [B<-t|--trust>] I<hosts>
 

xCAT-client/pods/man8/makedns.8.pod

@@ -31,7 +31,7 @@ Only entries in /etc/hosts or the hosts specified by B<noderange> that have a co
 By default, B<makedns> sets up the B<named> service and updates the DNS records on the local system (management node). If the -e flag is specified, it will also update the DNS records on any external DNS server that is listed in the /etc/resolv.conf on the management node. (Assuming the external DNS server can recognize the xCAT key as authentication.)
 
 For more information on Cluster Name Resolution:
-https://sourceforge.net/apps/mediawiki/xcat/index.php?title=Cluster_Name_Resolution
+read the following doc:Cluster_Name_Resolution
 
 =head1 OPTIONS
 

xCAT-client/pods/man8/rinstall.8.pod

@@ -4,32 +4,42 @@ B<rinstall> - Begin OS provision on a noderange
 
 =head1 B<Synopsis>
 
-B<rinstall> [I<-o>|I<--osver>] [I<-p>|I<--profile>] [I<-a>|I<--arch>] [I<-O>|I<--osimage>] [I<-c>|I<--console>] [I<noderange>]
+B<rinstall> [I<-o>|I<--osver>] [I<-p>|I<--profile>] [I<-a>|I<--arch>] [I<-c>|I<--console>] [I<noderange>]
+
+B<rinstall> [I<-O>|I<--osimage>] [I<-c>|I<--console>] [I<noderange>]
 
 =head1 B<Description>
 
-B<rinstall> is a convience command that will change tables as requested for operating system version, profile, and architecture, call B<nodeset> to modify the network boot configuration, call B<rsetboot> net to set the next boot over network (only support nodes with "nodetype.mgt=ipmi", for other nodes, make sure the correct boot order has been set before B<rinstall>), and B<rpower> to begin a boot cycle.
+B<rinstall> is a convenience command that will change tables as requested for operating system version, profile, and architecture, call B<nodeset> to modify the network boot configuration, call B<rsetboot> net to set the next boot over network (only support nodes with "nodetype.mgt=ipmi", for other nodes, make sure the correct boot order has been set before B<rinstall>), and B<rpower> to begin a boot cycle.
 
 If [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage> is set, provision the noderange with the osimage specified/configured, ignore the table change options if specified.
 
-If -c is specified, it will then become the text console of the node.  If wanting consoles on multiple nodes with a similar command, see L<winstall(8)|winstall.8>.
+If -c is specified, it will then run rcons on the node. This is allowed only if one node in the noderange.   If need consoles on multiple nodes , see L<winstall(8)|winstall.8>.
 
 =head1 B<Options>
 
 =over 7
 
+=item B<-h>|B<--help>
+
+Display usage message. 
+
+=item B<-v>|B<--version>
+
+Display version. 
+
 =item B<-o>|B<--osver>
 
-Specifies which os version to provision.  If unspecified, the current table values are used. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>. 
+Specifies which os version to provision.  If unspecified, the current node os setting is used. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>. 
 
 =item B<-p>|B<--profile>
 
-Specifies what profile should be used of the operating system.  If not specified the tables are used as is. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>.
+Specifies what profile should be used of the operating system.  If not specified the current node profile setting is used. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>.
 
 
 =item B<-a>|B<--arch>
 
-Specifies what architecture of the OS to provision.  Typically this is unneeded, but if provisioning betweer x86_64 and x86 frequently, this may be a useful flag. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>.
+Specifies what architecture of the OS to provision.  Typically this is unneeded, but if provisioning between x86_64 and x86 frequently, this may be a useful flag. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>.
 
 =item B<-O>|B<--osimage>
 
@@ -37,7 +47,7 @@ Specifies the osimage to provision.
 
 =item B<-c>|B<--console>
 
-Requests that rinstall become rcons once the provision commences.  This will only work if there is only one node in the noderange. See L<winstall(8)|winstall.8> for consoles on multiple systems.
+Requests that rinstall runs rcons once the provision starts.  This will only work if there is only one node in the noderange. See L<winstall(8)|winstall.8> for starting nsoles on multiple nodes.
 
 =back
 
@@ -46,17 +56,17 @@ Requests that rinstall become rcons once the provision commences.  This will onl
 
 B<rinstall> I<node1-node20>
 
-Provison nodes 1 through 20, using configuration as is from tables.
+Provison nodes 1 through 20, using their current configuration.
 
-B<rinstall> -o rhels5.1 -p compute I<node1-node20>
+B<rinstall> I<node1-node20> -o rhels5.1 -p compute
 
 Provision nodes 1 through 20, forcing rhels5.1 and compute profile.
 
-B<rinstall> -O rhels6.4-ppc64-netboot-compute I<node1-node20>
+B<rinstall> I<node1-node20> -O rhels6.4-ppc64-netboot-compute
 
 Provision nodes 1 through 20 with the osimage rhels6.4-ppc64-netboot-compute.
 
-B<rinstall> -c I<node1>
+B<rinstall>  I<node1> -c
 
 Provisoon node1 and start a console to monitor the process.
 

xCAT-client/pods/man8/winstall.8.pod

@@ -1,53 +1,64 @@
 =head1 Name
 
-B<winstall> - Begin OS provision on a noderange and display in wcons
+B<winstall> - Begin OS provision on a noderange
 
 =head1 B<Synopsis>
 
-B<winstall> [I<-o>|I<--osver>] [I<-p>|I<--profile>] [I<-a>|I<--arch>] [I<-O>|I<--osimage>] [I<noderange>]
+B<winstall> [I<-o>|I<--osver>] [I<-p>|I<--profile>] [I<-a>|I<--arch>] [I<noderange>]
+
+B<winstall> [I<-O>|I<--osimage>] [I<noderange>]
 
 =head1 B<Description>
 
-B<winstall> is a convience command that will change tables as requested for operating system version, profile, and architecture, call nodeset to modify the network boot configuration, and rpower to begin a boot cycle.  
+B<winstall> is a convenience tool that will change attributes as requested for operating system version, profile, and architecture, call B<nodeset> to modify the network boot configuration, call B<rsetboot> net to set the next boot over network (only support nodes
+with "nodetype.mgt=ipmi", for other nodes, make sure the correct boot order has been set before B<winstall>), and B<rpower> to begin a boot cycle.
 
-If [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage> is set, provision the noderange with the osimage specified/configured, ignore the table change options if specified
+If [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage> is set, provision the noderange with the osimage specified/configured, ignore the table change options if specified.
 
-It will then commence a wcons command to the noderange for monitoring.
+It  will then run wcons on the nodes. 
 
 =head1 B<Options>
 
 =over 7
 
+=item B<-h>|B<--help>
+
+Display usage message. 
+
+=item B<-v>|B<--version>
+
+Display version. 
+
 =item B<-o>|B<--osver>
 
-Specifies which os version to provision.  If unspecified, the current table values are used. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>. 
+Specifies which os version to provision.  If unspecified, the current node os setting is used. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>. 
 
 =item B<-p>|B<--profile>
 
-Specifies what profile should be used of the operating system.  If not specified the tables are used as is. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>.
+Specifies what profile should be used of the operating system.  If not specified the current node profile setting is used. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>.
 
 
 =item B<-a>|B<--arch>
 
-Specifies what architecture of the OS to provision.  Typically this is unneeded, but if provisioning betweer x86_64 and x86 frequently, this may be a useful flag. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>.
+Specifies what architecture of the OS to provision.  Typically this is unneeded, but if provisioning between x86_64 and x86 frequently, this may be a useful flag. Will be ignored if [I<-O>|I<--osimage>] is specified or nodetype.provmethod=I<osimage>.
 
 =item B<-O>|B<--osimage>
 
-Specifies the osimage to provision.
+Specifies the osimage to provision. 
 
 =back
 
 =head1 B<Examples>
 
-B<rinstall> I<node1-node20>
+B<winstall> I<node1-node20>
 
-Provison nodes 1 through 20, using configuration as is from tables.
+Provison nodes 1 through 20, using their current configuration.
 
-B<rinstall> -o rhels5.1 -p compute I<node1-node20>
+B<winstall> I<node1-node20> -o rhels5.1 -p compute
 
 Provision nodes 1 through 20, forcing rhels5.1 and compute profile.
 
-B<rinstall> -O rhels6.4-ppc64-netboot-compute I<node1-node20>
+B<winstall> I<node1-node20> -O rhels6.4-ppc64-netboot-compute
 
 Provision nodes 1 through 20 with the osimage rhels6.4-ppc64-netboot-compute.
 

xCAT-client/xCAT-client.spec

@@ -13,6 +13,8 @@ Prefix: /opt/xcat
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
 %define fsm %(if [ "$fsm" = "1" ];then echo 1; else echo 0; fi)
 
+%define pcm %(if [ "$pcm" = "1" ];then echo 1; else echo 0; fi)
+%define notpcm %(if [ "$pcm" = "1" ];then echo 0; else echo 1; fi)
 
 # AIX will build with an arch of "ppc"
 %ifos linux
@@ -115,6 +117,14 @@ cp share/xcat/tools/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/tools
 #cp usr/share/xcat/scripts/setup-local-client.sh $RPM_BUILD_ROOT/usr/share/xcat/scripts/setup-local-client.sh
 #chmod 755 $RPM_BUILD_ROOT/usr/share/xcat/scripts/setup-local-client.sh
 
+# PCM does not need getxcatdocs
+# getxcatdocs causes xCAT-client requires perl-JSON, which is not shipped with PCM
+%if %pcm
+rm -f $RPM_BUILD_ROOT/%{prefix}/bin/getxcatdocs
+rm -f $RPM_BUILD_ROOT/%{prefix}/share/doc/man1/getxcatdocs.1.html
+rm -f $RPM_BUILD_ROOT/%{prefix}/share/man/man1/getxcatdocs.1
+%endif
+
 # These links get made in the RPM_BUILD_ROOT/prefix area
 ln -sf xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rpower
 ln -sf xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rscan

xCAT-genesis-builder/buildrpm

@@ -13,6 +13,17 @@ DIR=`readlink -f $DIR`
 DRACUTMODDIR=/usr/share/dracut/modules.d/97xcat
 mkdir -p $DRACUTMODDIR
 cp $DIR/* $DRACUTMODDIR
+# For ppc64 platform, needs to remove some files,
+# and some files are in different directories
+if [ `uname -m` = "ppc64" ]; then
+        sed -i 's/dracut_install efibootmgr//' $DRACUTMODDIR/install
+        sed -i 's/ dmidecode//' $DRACUTMODDIR/install
+        sed -i 's/\/lib\/libncurses.so.5.7/\/lib64\/libncurses.so.5.7/' $DRACUTMODDIR/install
+        sed -i 's/\/usr\/lib\/libstdc++.so.6.0.13/\/usr\/lib64\/libstdc++.so.6.0.13/' $DRACUTMODDIR/install
+        sed -i 's/\/lib\/libgcc_s.so.1/\/lib64\/libgcc_s.so.1/' $DRACUTMODDIR/install
+        sed -i 's/\/lib\/libtinfo.so.5.7/\/lib64\/libtinfo.so.5.7/' $DRACUTMODDIR/install
+fi
+
 if [ "$HOSTOS" = "mcp" ]; then
 	sed -i 's/mkfs.btrfs//' $DRACUTMODDIR/install
 	sed -i 's/\/etc\/redhat-release/\/etc\/base-release \/etc\/system-release/' $DRACUTMODDIR/install

xCAT-genesis-builder/install

@@ -617,4 +617,9 @@ dracut_install /lib64/rsyslog/lmnet.so
 dracut_install /lib64/rsyslog/lmstrmsrv.so
 dracut_install /lib64/rsyslog/imuxsock.so
 dracut_install /usr/lib64/libnfsidmap/nsswitch.so
-dracut_install killall logger nc nslookup bc chown chroot dd expr kill mkdosfs parted rsync shutdown sort ssh-keygen tr blockdev findfs insmod kexec lvm mdadm mke2fs pivot_root sshd swapon tune2fs mkreiserfs reiserfstune # for sysclone
+dracut_install killall logger nc nslookup bc chown chroot dd expr kill mkdosfs parted rsync shutdown sort ssh-keygen tr blockdev findfs insmod kexec lvm mdadm mke2fs pivot_root sshd swapon tune2fs mkreiserfs reiserfstune pvcreate lvremove vgremove vgcreate  lvcreate  lvscan  lvchange vgchange pvdisplay lvdisplay vgdisplay blkid dmsetup # for sysclone
+dracut_install /lib/udev/rules.d/10-dm.rules
+dracut_install /lib/udev/rules.d/11-dm-lvm.rules
+dracut_install /lib/udev/rules.d/13-dm-disk.rules
+dracut_install /lib/udev/rules.d/69-dm-lvm-metad.rules
+dracut_install /lib/udev/rules.d/95-dm-notify.rules

xCAT-genesis-builder/installkernel

@@ -5,3 +5,7 @@ instmods macvlan macvtap 8021q bridge bonding vmxnet3 cpufreq_ondemand acpi-cpuf
 instmods mptctl #LSI firmware management requires this
 instmods mlx4_ib ib_umad #make the mellanox ib available enough to examine /sys
 instmods reiserfs #reiserfs on sysclone
+instmods ibmveth # ppc64 virtual ethernet
+instmods ibmvscsic # ppc64 virtual disk
+instmods ehea      # ppc64 hea ethernet
+instmods dm-mod  #support LVM for sysclone

xCAT-genesis-builder/restart

@@ -44,8 +44,10 @@ while [ $WAITING -gt 0 ]; do
     done
     WAITING=0
     if [ ! -z "$FORCENICS" ]; then
-        for nic in `ifconfig|grep HWaddr|awk '{print $1}'|egrep "$FORCENICS"`; do
-            if ! ifconfig $nic|grep "inet addr" > /dev/null; then
+        #for nic in `ifconfig|grep HWaddr|awk '{print $1}'|egrep "$FORCENICS"`; do
+        for nic in `ip  -oneline link show |grep -i ether |awk -F ':' '{print $2}'|grep -o "[^ ]\+\( \+[^ ]\+\)*"|egrep "$FORCENICS"`; do
+        #    if ! ifconfig $nic|grep "inet addr" > /dev/null; then
+            if ! ip -4 -oneline addr show $nic|grep -i inet > /dev/null; then
                 WAITING=1
             fi
         done

xCAT-genesis-builder/xCAT-genesis-base.spec

@@ -53,7 +53,10 @@ cd -
 if [ "$1" == "2" ]; then #only on upgrade, as on install it's probably not going to work...
 	if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
    		. /etc/profile.d/xcat.sh
-   		mknb %{tarch}
+   		#mknb %{tarch}
+        echo "If you are installing/updating xCAT-genesis-base separately, not as part of installing/updating all of xCAT, run 'mknb <arch> manually'"
+        mkdir -p /etc/xcat
+        touch /etc/xcat/genesis-base-updated
    	fi
 fi
 

xCAT-genesis-builder/xCAT-genesis-builder.spec

@@ -4,7 +4,7 @@ BuildArch: noarch
 Release: snap%(date +"%Y%m%d%H%M")
 Epoch: 1
 AutoReq: false
-Requires: efibootmgr ipmitool screen btrfs-progs lldpad rpm-build compat-libstdc++-33
+Requires: ipmitool screen btrfs-progs lldpad rpm-build compat-libstdc++-33
 Prefix: /opt/xcat
 AutoProv: false
 
@@ -41,4 +41,4 @@ cd -
 %Files
 %defattr(-,root,root)
 %doc LICENSE.html
-/
+/opt/xcat/share/xcat/netboot/genesis/builder

xCAT-genesis-scripts/bin/bmcsetup

@@ -51,11 +51,13 @@ if [ "$IPMIMFG" == 2 ]; then #IBM
         BMCPORT=`grep bmcport /tmp/ipmicfg.xml |awk -F\> '{print $2}'|awk -F\< '{print $1}'`
         if [ ! -z "$BMCPORT" ]; then
 	    let idev=0
+	    IFS=','
 	    for p in $BMCPORT; do
             	ipmitool -d $idev raw 0xc 1 1 0xc0 $p > /dev/null
             	ipmitool -d $idev raw 0x04 0x12 0x09 0x01 0x18 0x${p}1 0x00 > /dev/null
 	    	let idev=idev+1
 	    done
+	    unset IFS
         fi
     elif [ "$XPROD" == "291" ]; then
         LOCKEDUSERS=1
@@ -65,10 +67,12 @@ if [ "$IPMIMFG" == 2 ]; then #IBM
             BMCPORT=`grep bmcport /tmp/ipmicfg.xml |awk -F\> '{print $2}'|awk -F\< '{print $1}'`
             if [ ! -z "$BMCPORT" ]; then
 	    	let idev=0
+		    IFS=','
 		    for p in $BMCPORT; do
 	            	ipmitool -d $idev raw 0xc 1 1 0xc0 $p > /dev/null
 		    	let idev=idev+1
 		    done
+		    unset IFS
             fi
         fi
     fi
@@ -82,6 +86,7 @@ elif [ "$IPMIMFG" == 20301 ] ; then
         BMCPORT=`grep bmcport /tmp/ipmicfg.xml |awk -F\> '{print $2}'|awk -F\< '{print $1}'`
         if [ ! -z "$BMCPORT" ]; then
 	    	let idev=0
+		    IFS=','
 		    for p in $BMCPORT; do
 	            	ipmitool -d $idev raw 0xc 1 1 0xc0 $p > /dev/null
 		        NEWPORT=`ipmitool -d $idev raw 0xc 2 1 0xc0 0 0|awk '{print $2}'`
@@ -89,6 +94,7 @@ elif [ "$IPMIMFG" == 20301 ] ; then
 
 		    	let idev=idev+1
 		    done
+		    unset IFS
         fi
 elif [ "$IPMIMFG" == "47488" ]; then
         LOCKEDUSERS=1
@@ -362,6 +368,21 @@ if [ ! "$IPMIVER" == "1.5"  ]; then
     if [ $TRIES -gt $TIMEOUT ]; then echo "ERROR"; else echo "OK"; fi
 fi
 
+XPROD=`ipmitool mc info|grep "^Product ID"|awk '{print $4}'`
+if [ "$XPROD" = "309" ] ; then
+    # Reset the BMC for the x3755 M4 (8722), otherwise will not be able to get to the BMC
+    echo "Resetting BMC ..."
+    ipmitool mc reset cold
+    echo "Waiting for the BMC to appear ..."
+    sleep 15
+    TRIES=0
+    while ! ipmitool lan print $LANCHAN > /dev/null; do
+        sleep 3
+        let TRIES=TRIES+1
+        if [ $TRIES -gt $TIMEOUT ]; then break; fi
+   done
+fi
+
 # update the node status to 'bmcready'
 for parm in `cat /proc/cmdline`; do
 	key=`echo $parm|awk -F= '{print $1}'`

xCAT-genesis-scripts/bin/doxcat

@@ -4,11 +4,13 @@
 #     Bug reported by Jeff Lang <jrlang@uwyo.edu>.  Thanks, Jeff!
 #
 
-modprobe acpi_cpufreq
+modprobe acpi_cpufreq 2>/dev/null		# on some machines this fails
 modprobe cpufreq_ondemand
-for gov in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
-	echo -n ondemand > $gov
-done
+if ls /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor &>/dev/null; then
+	for gov in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
+		echo -n ondemand > $gov
+	done
+fi
 if [ ! -z "$BOOTIF" ]; then
 	BOOTIF=`echo $BOOTIF|sed -e s/01-// -e s/-/:/g`
 	echo -n "Waiting for device with address $BOOTIF to appear.."
@@ -74,21 +76,89 @@ echo '};' >> /var/lib/lldpad/lldpad.conf
 done
 echo '};' >> /var/lib/lldpad/lldpad.conf
 lldpad -d
-dhclient -cf /etc/dhclient.conf -pf /var/run/dhclient.$bootnic.pid $bootnic &
-#we'll kick of IPv6 and IPv4 on all nics, but not wait for them to come up unless doing discovery, to reduce
-#chances that we'll perform a partial discovery
-#in other scenarios where downed non-bootnics cause issues, will rely on retries to fix things up
-dhclient -6 -pf /var/run/dhclient6.$bootnic.pid $bootnic -lf /var/lib/dhclient/dhclient6.leases &
-NICSTOBRINGUP=`ip link|grep mtu|grep -v LOOPBACK|grep -v $bootnic|grep -v usb|grep -v ,UP|awk -F: '{print $2}'`
-export NICSTOBRINGUP
-for nic in $NICSTOBRINGUP; do
-	(while ! ethtool $nic | grep Link\ detected|grep yes > /dev/null; do sleep 5; done; dhclient -cf /etc/dhclient.conf -pf /var/run/dhclient.$nic.pid $nic ) &
-	(while ! ethtool $nic | grep Link\ detected|grep yes > /dev/null; do sleep 5; done; dhclient -cf /etc/dhclient.conf -6 -pf /var/run/dhclient6.$nic.pid -lf /var/lib/dhclient/dhclient6.leases $nic ) &
-done
-openssl genrsa -out /etc/xcat/certkey.pem 4096 > /dev/null 2>&1 &
 
-	
-	
+# Caclulate the broadcast address of a given IP address and mask.
+bcastcalc(){
+  read oct1 oct2 oct3 oct4 << HERE
+    $(echo "$1" | sed -e 's/\./ /g')
+HERE
+  read msk1 msk2 msk3 msk4 << HERE
+    $(echo "$2" | sed -e 's/\./ /g')
+HERE
+  ipa=$(($oct1+(255-($oct1 | $msk1))))
+  ipb=$(($oct2+(255-($oct2 | $msk2))))
+  ipc=$(($oct3+(255-($oct3 | $msk3))))
+  ipd=$(($oct4+(255-($oct4 | $msk4))))
+  echo "$ipa.$ipb.$ipc.$ipd"
+}
+
+# Calculates the number of bits in a netmask for converting something like 255.255.255.192 to 26 so
+# you can use the notation 10.0.0.1/26
+mask2prefix() {
+    nbits=0
+    old_ifs=$IFS
+    IFS=.
+    for dec in $1 ; do
+        case $dec in
+            255) let nbits+=8;;
+            254) let nbits+=7;;
+            252) let nbits+=6;;
+            248) let nbits+=5;;
+            240) let nbits+=4;;
+            224) let nbits+=3;;
+            192) let nbits+=2;;
+            128) let nbits+=1;;
+            0);;
+            *) echo "Error: $dec is not recognised"; exit 1
+        esac
+    done
+    IFS=$old_ifs
+    echo "$nbits"
+}
+
+# see if they specified static ip info, otherwise use dhcp
+for parm in `cat /proc/cmdline`; do
+    key=`echo $parm|awk -F= '{print $1}'`
+    value=`echo $parm|awk -F= '{print $2}'`
+    if [[ ${key,,} == "hostip" || ${key,,} == "ipaddr" ]]; then
+        hostip=$value
+    elif [[ ${key,,} == "netmask" ]]; then
+        netmask=$value
+    elif [[ ${key,,} == "gateway" ]]; then
+        gateway=$value
+    fi
+done
+if [[ -n $hostip && -n $netmask && -n $gateway && -n $bootnic ]]; then
+	# doing static ip
+	# the device was determined above from the bootif mac, and put in bootnic
+	numbits=$(mask2prefix $netmask)
+	broadcast=$(bcastcalc $hostip $netmask)
+	echo "Setting static IP=$hostip/$numbits broadcast=$broadcast gateway=$gateway device=$bootnic BOOTIF=$BOOTIF ..."
+	ip addr add $hostip/$numbits broadcast $broadcast dev $bootnic scope global label $bootnic
+	ip link set $bootnic up
+	ip route replace to default via $gateway dev $bootnic
+	# in softlayer it takes up to 60 seconds for the nic to actually be able to communicate
+	echo -n Waiting to reach xCAT mgmt node $gateway.
+	xcatretries=60
+	while [ $((xcati+=1)) -le $xcatretries ] && ! ping -c2 -w3 $gateway >/dev/null 2>&1; do echo -n .; done
+	if [ $xcati -le $xcatretries ]; then echo " success"; else echo " failed"; fi
+	sleep 3
+else
+	echo "Setting IP via DHCP..."
+	dhclient -cf /etc/dhclient.conf -pf /var/run/dhclient.$bootnic.pid $bootnic &
+	#we'll kick of IPv6 and IPv4 on all nics, but not wait for them to come up unless doing discovery, to reduce
+	#chances that we'll perform a partial discovery
+	#in other scenarios where downed non-bootnics cause issues, will rely on retries to fix things up
+	dhclient -6 -pf /var/run/dhclient6.$bootnic.pid $bootnic -lf /var/lib/dhclient/dhclient6.leases &
+	NICSTOBRINGUP=`ip link|grep mtu|grep -v LOOPBACK|grep -v $bootnic|grep -v usb|grep -v ,UP|awk -F: '{print $2}'`
+	export NICSTOBRINGUP
+	for nic in $NICSTOBRINGUP; do
+		(while ! ethtool $nic | grep Link\ detected|grep yes > /dev/null; do sleep 5; done; dhclient -cf /etc/dhclient.conf -pf /var/run/dhclient.$nic.pid $nic ) &
+		(while ! ethtool $nic | grep Link\ detected|grep yes > /dev/null; do sleep 5; done; dhclient -cf /etc/dhclient.conf -6 -pf /var/run/dhclient6.$nic.pid -lf /var/lib/dhclient/dhclient6.leases $nic ) &
+	done
+fi
+
+openssl genrsa -out /etc/xcat/certkey.pem 4096 > /dev/null 2>&1 &
 
 gripeiter=101
 echo -n "Acquiring network addresses.."

xCAT-genesis-scripts/debian/copyright

@@ -1,36 +1,88 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: xcat-genesis-scripts
-Source: <url://example.com>
+Eclipse Public License - v 1.0
 
-Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: <special license>
- <Put the license of the package here indented by 1 space>
- <This follows the format of Description: lines in control file>
- .
- <Including paragraphs>
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 
-# If you want to use GPL v2 or later for the /debian/* files use 
-# the following clauses, or change it to suit. Delete these two lines
-Files: debian/*
-Copyright: 2013 root <root@unknown>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+1. DEFINITIONS
 
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+ 

xCAT-genesis-scripts/etc/init.d/functions

@@ -1590,7 +1590,8 @@ send_monitor_msg() {
 
     # Get the client mac address.
     if [ -z "$mac" ]; then
-        mac=`ifconfig $DEVICE 2>/dev/null | sed -ne "s/.*HWaddr //p" | sed "s/ //g" | sed s/:/./g`
+        #mac=`ifconfig $DEVICE 2>/dev/null | sed -ne "s/.*HWaddr //p" | sed "s/ //g" | sed s/:/./g`
+        mac=`ip -4 -oneline link show $DEVICE 2>/dev/null|grep -i ether|sed -ne "s/.*ether //p"|awk -F ' ' '{print $1}'|sed s/:/./g`
     fi
 
     # Collect some special info only after proc file system is mounted.

xCAT-genesis-scripts/xCAT-genesis-scripts.spec

@@ -67,6 +67,7 @@ cd -
 # should run mknb.  Tried to use rpm triggers, but in several cases the trigger would
 # get run multiple times.
 #echo "touching /etc/xcat/genesis-scripts-updated"
+echo "If you are installing/updating xCAT-genesis-base separately, not as part of installing/updating all of xCAT, run 'mknb <arch> manually'"
 mkdir -p /etc/xcat
 touch /etc/xcat/genesis-scripts-updated
 

xCAT-rmc/scripts/monerrorlog

@@ -10,12 +10,17 @@
   checks for errors.
 =cut
 #------------------------------------------------------------------------------#
-
+BEGIN
+{
+  $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
+}
+use lib "$::XCATROOT/lib/perl";
 use strict;
 use locale;
 use Getopt::Long;
 use IPC::SysV qw(IPC_STAT S_IRWXU IPC_PRIVATE IPC_CREAT S_IRUSR S_IWUSR );
 use IPC::Msg;
+use xCAT::Utils;
 
 BEGIN
 {
@@ -109,8 +114,9 @@ if (&first_time_run)
   			    runcmd("/usr/bin/mkfifo $fifo");
                         }
 			runcmd("echo \"$embedinfo\" >> $syslogconf");
-			my $cmd = service("syslog", "restart");
-			runcmd($cmd);
+			#my $cmd = service("syslog", "restart");
+			#runcmd($cmd);
+			xCAT::Utils->restartservice("syslog");
 		}
 		touchFile($runfile);
 	}
@@ -512,6 +518,9 @@ sub createRandomName
                     'stop' or 'status'. 
     Returns:
         A full cli for the service script.
+    Comment:
+        this subroutine is deprecated, use service subroutines in xCAT::Utils
+        instead   
 =cut
 
 #--------------------------------------------------------------------------------

xCAT-rmc/xCAT-rmc.spec

@@ -106,7 +106,7 @@ fi
 %ifos linux
   if [ -f "/proc/cmdline" ]; then   # prevent running it during install into chroot image
     if [ -f $RPM_INSTALL_PREFIX0/sbin/xcatd  ]; then
-      /etc/init.d/xcatd reload
+      /etc/init.d/xcatd restart 
     fi
   fi
 %else

xCAT-server/lib/perl/xCAT/IPMI.pm

@@ -121,6 +121,7 @@ sub new {
     unless ($ipmi2support) {
         $self->{ipmi15only} = 1;
     }
+    $self->{privlevel} = 4;
     unless ($args{'bmc'} and defined $args{'userid'} and defined $args{'password'}) {
         $self->{error}="bmc, userid, and password must be specified";
         return $self;
@@ -308,7 +309,7 @@ sub session_activated {
 
 sub set_admin_level {
     my $self= shift;
-    $self->subcmd(netfn=>0x6,command=>0x3b,data=>[4],callback=>\&admin_level_set,callback_args=>$self);
+    $self->subcmd(netfn=>0x6,command=>0x3b,data=>[$self->{privlevel}],callback=>\&admin_level_set,callback_args=>$self);
 }
 sub admin_level_set {
     my $rsp = shift;
@@ -319,6 +320,12 @@ sub admin_level_set {
             0x82 => "Cannot disable User Level authentication",
             );
     my $code = $rsp->{code};
+    if (($code == 0x80 or $code == 0x81) and $self->{privlevel} == 4) {
+            $self->{privlevel} = 3;
+            $self->subcmd(netfn=>0x6,command=>0x3b,data=>[$self->{privlevel}],callback=>\&admin_level_set,callback_args=>$self);
+            return;
+    }
+
     if ($code) {
         my $errtxt = sprintf("ERROR: Failed requesting  administrator privilege %02xh",$code);
         if ($localcodes{$code}) {
@@ -686,7 +693,7 @@ sub send_rakp3 {
     $self->{rmcptag}+=1;
     my @payload = ($self->{rmcptag},0,0,0,@{$self->{pendingsessionid}});
     my @user = unpack("C*",$self->{userid});
-    push @payload,unpack("C*",hmac_sha1(pack("C*",@{$self->{remoterandomnumber}},@{$self->{sidm}},4,scalar @user,@user),$self->{password}));
+    push @payload,unpack("C*",hmac_sha1(pack("C*",@{$self->{remoterandomnumber}},@{$self->{sidm}},$self->{privlevel},scalar @user,@user),$self->{password}));
     $self->sendpayload(payload=>\@payload,type=>$payload_types{'rakp3'});
 }
 
@@ -700,7 +707,7 @@ sub send_rakp1 {
         push @{$self->{randomnumber}},$randomnumber;
     }
     push @payload, @{$self->{randomnumber}};
-    push @payload,(4,0,0); # request admin
+    push @payload,($self->{privlevel},0,0); # request priv
     my @user = unpack("C*",$self->{userid});
     push @payload,scalar @user;
     push @payload,@user;
@@ -709,6 +716,8 @@ sub send_rakp1 {
 }
 sub init {
     my $self = shift;
+    $self->{confalgo} = undef;
+    $self->{integrityalgo}=undef;
     $self->{sessionestablishmentcontext} = 0;
     $self->{'sequencenumber'} = 0; #init sequence number
     $self->{'sequencenumberbytes'} = [0,0,0,0]; #init sequence number
@@ -816,6 +825,13 @@ sub got_rakp2 {
     }
     $byte = shift @data;
     unless ($byte == 0x00) {
+        if (($byte == 0x9 or $byte == 0xd) and $self->{privlevel} == 4) {
+            # this is probably an environment that wants to give us only operator
+            # try to connect again at 3.
+            $self->{privlevel} = 3;
+            $self->relog();
+            return;
+        }
 	if ($byte == 0x02) { #invalid session id is almost certainly because a retry on rmcp+ open session response rendered our session id invalid, ignore this in the hope that we'll get an answer for our retry that invalidated us..
 	    #$self->relog();
 		#TODO: probably should disable RAKP1 retry here...  high likelihood that we'll just spew a bad RAKP1 and Open Session Request retry would be more appropriate to try to discern a valid session id
@@ -840,7 +856,7 @@ sub got_rakp2 {
     #Data now represents authcode.. sha1 only..
     my @user = unpack("C*",$self->{userid});
     my $ulength = scalar @user;
-    my $hmacdata = pack("C*",(@{$self->{sidm}},@{$self->{pendingsessionid}},@{$self->{randomnumber}},@{$self->{remoterandomnumber}},@{$self->{remoteguid}},4,$ulength,@user));
+    my $hmacdata = pack("C*",(@{$self->{sidm}},@{$self->{pendingsessionid}},@{$self->{randomnumber}},@{$self->{remoterandomnumber}},@{$self->{remoteguid}},$self->{privlevel},$ulength,@user));
     my @expectedhash = (unpack("C*",hmac_sha1($hmacdata,$self->{password})));
     foreach (0..(scalar(@expectedhash)-1)) {
         if ($expectedhash[$_] != $data[$_]) {
@@ -849,7 +865,7 @@ sub got_rakp2 {
             return 9;
         }
     }
-    $self->{sik} = hmac_sha1(pack("C*",@{$self->{randomnumber}},@{$self->{remoterandomnumber}},4,$ulength,@user),$self->{password});
+    $self->{sik} = hmac_sha1(pack("C*",@{$self->{randomnumber}},@{$self->{remoterandomnumber}},$self->{privlevel},$ulength,@user),$self->{password});
     $self->{k1} = hmac_sha1(pack("C*",1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1),$self->{sik});
     $self->{k2} = hmac_sha1(pack("C*",2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2),$self->{sik});
     my @aeskey = unpack("C*",$self->{k2});

xCAT-server/lib/perl/xCAT/PPC.pm

@@ -1237,7 +1237,7 @@ sub resolve {
             #############################
             # Find MTMS in vpd database
             #############################
-            if ( exists( $att->{parent} )) {
+            if ( $att->{parent}) {
                 my @attrs = qw(mtm serial);
                 my ($vpd) = $tabs->{vpd}->getNodeAttribs($att->{parent},\@attrs);
 
@@ -2195,9 +2195,10 @@ sub process_request {
     #if( $request->{hwtype} ne 'hmc' ) {
     if( $request->{hwtype} !~ /hmc|ivm/ ) {
         $request->{fsp_api} = 1;
-        #For using rspconfig to disable/enable dev/celogin1 through ASMI
-        my $arg = $request->{arg};
-        if($request->{command} eq "rspconfig" and grep(/^(dev|celogin1)/, @$arg)) {
+        #For using rspconfig options through ASMI
+        #my $arg = $request->{arg};
+        #if($request->{command} eq "rspconfig" and grep(/^(dev|celogin1)/, @$arg)) {
+        if($request->{command} eq "rspconfig" and ref($request->{method}) eq 'HASH') {
            $request->{fsp_api} = 0;
         }
     } else {

xCAT-server/lib/perl/xCAT/Postage.pm

@@ -1866,6 +1866,39 @@ sub getPostScripts
         $result .=  "setbootfromdisk\n";
     }
 
+    
+
+    #for redhat 7, append "disableconsistentNICrename" to default postscripts 
+    #if "net.ifnames=0" is specified in kcmdline/addkcmdline of node or osimage 
+    my $tftpdir = xCAT::TableUtils::getTftpDir();
+    my $osimagetab=xCAT::Table->new('osimage',-create=>1);
+    my $osimgent = $osimagetab->getAttribs({imagename => $osimgname },'osvers');
+    my $os = $osimgent->{'osvers'};    
+    my $nrret = $::GLOBAL_TAB_HASH{noderes}{$node};
+    my $netboot = $nrret->{'netboot'};
+
+    if( (($os =~ "rhel7*") || ($os =~ "rhels7*")) && ($nodesetstate) && ($nodesetstate eq "install") )
+    {
+       my $nodecfg;
+       if($netboot eq "grub2")
+       {
+          $nodecfg="$tftpdir/boot/grub2/$node";
+       }elsif($netboot eq "xnba")
+       {
+          $nodecfg="$tftpdir/xcat/xnba/nodes/$node";
+
+       }elsif($netboot eq "pxe")
+       {
+          $nodecfg="$tftpdir/pxelinux.cfg/$node";
+
+       }
+
+       my $rc=system("grep net.ifnames=0 $nodecfg >/dev/null 2>&1");
+       if($rc ==0)
+       {
+            $result .=  "disableconsistentNICrename\n";
+       }
+    }    
 
     return $result;
 }

xCAT-server/lib/perl/xCAT/SvrUtils.pm

@@ -53,6 +53,7 @@ sub getNodesetStates
         my @pxenodes    = ();
         my @yabootnodes = ();
         my @xnbanodes= ();
+        my @grub2nodes = ();
         my $tabdata     = $tab->getNodesAttribs(\@nodes, ['node', 'netboot']);
         foreach my $node (@nodes)
         {
@@ -75,6 +76,10 @@ sub getNodesetStates
             {
                 push(@aixnodes, $node);
             }
+            elsif ($nb eq "grub2")
+            {
+                push(@grub2nodes, $node);
+            }
         }
 
         my @retarray;
@@ -131,6 +136,18 @@ sub getNodesetStates
                 xCAT::MsgUtils->message('E', $retarray[1]);
             }
         }
+        if (@grub2nodes > 0)
+        {
+            require xCAT_plugin::grub2;
+            @retarray =
+              xCAT_plugin::grub2::getNodesetStates(\@grub2nodes, $hashref);
+            if ($retarray[0])
+            {
+                $retcode = $retarray[0];
+                $errormsg .= $retarray[1];
+                xCAT::MsgUtils->message('E', $retarray[1]);
+            }
+        }
     }
     return (0, "");
 }

xCAT-server/lib/perl/xCAT/Template.pm

@@ -151,166 +151,174 @@ sub subvars {
     }
   }
 
-  #do *all* includes, recursive and all
-  my $doneincludes=0;
-  while (not $doneincludes) {
-    $doneincludes=1;
-    if ($inc =~ /#INCLUDE_PKGLIST:[^#^\n]+#/) {
-      $doneincludes=0;
-      $inc =~ s/#INCLUDE_PKGLIST:([^#^\n]+)#/includefile($1, 0, 1)/eg;
-    }
-    if ($inc =~ /#INCLUDE_PTRNLIST:[^#^\n]+#/) {
-      $doneincludes=0;
-      $inc =~ s/#INCLUDE_PTRNLIST:([^#^\n]+)#/includefile($1, 0, 2)/eg;
-    }
-    if ($inc =~ /#INCLUDE_RMPKGLIST:[^#^\n]+#/) {
-      $doneincludes=0;
-      $inc =~ s/#INCLUDE_RMPKGLIST:([^#^\n]+)#/includefile($1, 0, 3)/eg;
-    }
-    if ($inc =~ /#INCLUDE:[^#^\n]+#/) {
-      $doneincludes=0;
-      $inc =~ s/#INCLUDE:([^#^\n]+)#/includefile($1, 0, 0)/eg;
-    }
-  }
-
-  #support multiple paths of osimage in rh/sles diskfull installation
-  my @pkgdirs;
-  if ( defined($media_dir) ) {
-      @pkgdirs = split(",", $media_dir);
-      my $source;
-      my $source_in_pre;
-      my $c = 0; 
-      foreach my $pkgdir(@pkgdirs) {
-          if( $platform =~ /^(rh|SL|centos|fedora)$/ ) {
-              if ( $c == 0 ) {
-                  # After some tests, if we put the repo in  pre scripts in the kickstart like for rhels6.x
-                  # the rhels5.9 will not be installed successfully. So put in kickstart directly.
-                  $source_in_pre .=  "echo 'url --url http://'\$nextserver'/$pkgdir' >> /tmp/repos";
-                  $source .=  "url --url http://#TABLE:noderes:\$NODE:nfsserver#/$pkgdir\n"; #For rhels5.9
-              } else {
-                  $source_in_pre .=  "\necho 'repo --name=pkg$c --baseurl=http://'\$nextserver'/$pkgdir' >> /tmp/repos";  
-                  $source .=  "repo --name=pkg$c --baseurl=http://#TABLE:noderes:\$NODE:nfsserver#/$pkgdir\n";  #for rhels5.9
-              }
-          } elsif ($platform =~ /^(sles|suse)/) {
-              my $http = "http://#TABLE:noderes:\$NODE:nfsserver#$pkgdir";
-              $source .=  "         <listentry>
-           <media_url>$http</media_url>
-           <product>SuSE-Linux-pkg$c</product>
-           <product_dir>/</product_dir>
-           <ask_on_error config:type=\"boolean\">false</ask_on_error> <!-- available since openSUSE 11.0 -->
-           <name>SuSE-Linux-pkg$c</name> <!-- available since openSUSE 11.1/SLES11 (bnc#433981) -->
-         </listentry>";
-           $source_in_pre .="<listentry><media_url>http://'\$nextserver'$pkgdir</media_url><product>SuSE-Linux-pkg$c</product><product_dir>/</product_dir><ask_on_error config:type=\"boolean\">false</ask_on_error><name>SuSE-Linux-pkg$c</name></listentry>";
+  #if user specify the partion file, replace the default partition strategy
+  my $partcontent;
+  my $scriptflag = 0;
+  if ($partitionfile){
+      if ($partitionfile =~ /^s:(.*)/){
+          $scriptflag = 1;
+          $partitionfile = $1;
+      }
+  
+      if (-r $partitionfile){
+          open ($inh, "<", $partitionfile);
+          while (<$inh>){
+              $partcontent .= $_;
           }
-          $c++;
+          close ($inh);
       }
 
-      $inc =~ s/#INSTALL_SOURCES#/$source/g;
-      $inc =~ s/#INSTALL_SOURCES_IN_PRE#/$source_in_pre/g;
+      # append the partition file into the $inc to do the replacement
+      $inc .= "\nFFFFFFFFFFFFPARTITIONFILESTART\n".$partcontent;
   }
 
 
+  #do *all* includes, recursive for all
+  my $doneincludes=0;
+  while (not $doneincludes) {
+      $doneincludes=1;
+      $inc =~ s/#ENV:([^#]+)#/envvar($1)/eg;  # handle the variable in #INCLUDE
+      if ($inc =~ /#INCLUDE_PKGLIST:[^\n]+#/) {
+          # get in this section but might not do the replace since it needs wait
+          # for the replace of sting inside the #INCLUDE_PKGLIST:xx#
+          $doneincludes=0;
+          $inc =~ s/#INCLUDE_PKGLIST:([^#^\n]+)#/includefile($1, 0, 1)/eg;
+      }
+      if ($inc =~ /#INCLUDE_PTRNLIST:[^\n]+#/) {
+          $doneincludes=0;
+          $inc =~ s/#INCLUDE_PTRNLIST:([^#^\n]+)#/includefile($1, 0, 2)/eg;
+      }
+      if ($inc =~ /#INCLUDE_RMPKGLIST:[^\n]+#/) {
+          $doneincludes=0;
+          $inc =~ s/#INCLUDE_RMPKGLIST:([^#^\n]+)#/includefile($1, 0, 3)/eg;
+      }
+      if ($inc =~ /#INCLUDE:[^\n]+#/) {
+          $doneincludes=0;
+          $inc =~ s/#INCLUDE:([^#^\n]+)#/includefile($1, 0, 0)/eg;
+      }
 
+      #support multiple paths of osimage in rh/sles diskfull installation
+      my @pkgdirs;
+      if ( defined($media_dir) ) {
+          @pkgdirs = split(",", $media_dir);
+          my $source;
+          my $source_in_pre;
+          my $c = 0; 
+          foreach my $pkgdir(@pkgdirs) {
+              if( $platform =~ /^(rh|SL|centos|fedora)$/ ) {
+                  if ( $c == 0 ) {
+                      # After some tests, if we put the repo in  pre scripts in the kickstart like for rhels6.x
+                      # the rhels5.9 will not be installed successfully. So put in kickstart directly.
+                      $source_in_pre .=  "echo 'url --url http://'\$nextserver'/$pkgdir' >> /tmp/repos";
+                      $source .=  "url --url http://#TABLE:noderes:\$NODE:nfsserver#/$pkgdir\n"; #For rhels5.9
+                  } else {
+                      $source_in_pre .=  "\necho 'repo --name=pkg$c --baseurl=http://'\$nextserver'/$pkgdir' >> /tmp/repos";  
+                      $source .=  "repo --name=pkg$c --baseurl=http://#TABLE:noderes:\$NODE:nfsserver#/$pkgdir\n";  #for rhels5.9
+                  }
+              } elsif ($platform =~ /^(sles|suse)/) {
+                  my $http = "http://#TABLE:noderes:\$NODE:nfsserver#$pkgdir";
+                  $source .=  "         <listentry>
+               <media_url>$http</media_url>
+               <product>SuSE-Linux-pkg$c</product>
+               <product_dir>/</product_dir>
+               <ask_on_error config:type=\"boolean\">false</ask_on_error> <!-- available since openSUSE 11.0 -->
+               <name>SuSE-Linux-pkg$c</name> <!-- available since openSUSE 11.1/SLES11 (bnc#433981) -->
+             </listentry>";
+               $source_in_pre .="<listentry><media_url>http://'\$nextserver'$pkgdir</media_url><product>SuSE-Linux-pkg$c</product><product_dir>/</product_dir><ask_on_error config:type=\"boolean\">false</ask_on_error><name>SuSE-Linux-pkg$c</name></listentry>";
+              }
+              $c++;
+          }
+    
+          $inc =~ s/#INSTALL_SOURCES#/$source/g;
+          $inc =~ s/#INSTALL_SOURCES_IN_PRE#/$source_in_pre/g;
+      }
+    
+      #ok, now do everything else..
+      my $shortname = $node;
+      $shortname =~ s/\..*//;
+      $inc =~ s/#TABLE:([^:]+):([^:]+):([^#]+)#/tabdb($1,$2,$3)/eg;
+      $inc =~ s/#TABLEBLANKOKAY:([^:]+):([^:]+):([^#]+)#/tabdb($1,$2,$3,'1')/eg;
+      $inc =~ s/#INCLUDE_NOP:([^#^\n]+)#/includefile($1,1,0)/eg;
+      $inc =~ s/#XCATVAR:([^#]+)#/envvar($1)/eg;
+      $inc =~ s/#ENV:([^#]+)#/envvar($1)/eg;
+      $inc =~ s/#MACHINEPASSWORD#/machinepassword()/eg;
+      $inc =~ s/#CRYPT:([^:]+):([^:]+):([^#]+)#/crydb($1,$2,$3)/eg;
+      $inc =~ s/#COMMAND:([^#]+)#/command($1)/eg;
+      $inc =~ s/#KICKSTARTNET#/kickstartnetwork()/eg;
+      $inc =~ s/#YAST2NET#/yast2network()/eg;
+      $inc =~ s/#ESXIPV6SETUP#/esxipv6setup()/eg;
+      $inc =~ s/#WINTIMEZONE#/xCAT::TZUtils::get_wintimezone()/eg;
+      $inc =~ s/#WINPRODKEY:([^#]+)#/get_win_prodkey($1)/eg;
+      $inc =~ s/#WINNETCFG#/windows_net_cfg()/eg;
+      $inc =~ s/#WINADJOIN#/windows_join_data()/eg;
+      $inc =~ s/#WINDNSCFG#/windows_dns_cfg()/eg;
+      $inc =~ s/#WINACCOUNTDATA#/windows_account_data()/eg;
+      $inc =~ s/#WINDISABLENULLADMIN#/windows_disable_null_admin()/eg;
+      $inc =~ s/#MANAGEDADDRESSMODE#/managed_address_mode()/eg;
+      $inc =~ s/#HOSTNAME#/$node/g;
+      $inc =~ s/#SHORTNAME#/$shortname/g;
+      $inc =~ s/#GETNODEDOMAIN:([^#]+)#/get_node_domain($1)/eg;
+    
+      my $nrtab = xCAT::Table->new("noderes");
+      my $tftpserver = $nrtab->getNodeAttribs($node, ['tftpserver']);
+      my $sles_sdk_media = "http://" . $tftpserver->{tftpserver} . $media_dir . "/sdk1";
+      
+      $inc =~ s/#SLES_SDK_MEDIA#/$sles_sdk_media/eg;
 
-  #Support hierarchical include
-  $inc =~ s/#ENV:([^#]+)#/envvar($1)/eg;
-  if ($inc =~ /#INCLUDE:[^#^\n]+#/) {
-     $inc =~ s/#INCLUDE:([^#^\n]+)#/includefile($1, 0, 0)/eg;
-  }
-
-  #ok, now do everything else..
-  $inc =~ s/#TABLE:([^:]+):([^:]+):([^#]+)#/tabdb($1,$2,$3)/eg;
-  $inc =~ s/#TABLEBLANKOKAY:([^:]+):([^:]+):([^#]+)#/tabdb($1,$2,$3,'1')/eg;
-  $inc =~ s/#INCLUDE_NOP:([^#^\n]+)#/includefile($1,1,0)/eg;
-  $inc =~ s/#INCLUDE_PKGLIST:([^#^\n]+)#/includefile($1,0,1)/eg;
-  $inc =~ s/#INCLUDE_PTRNLIST:([^#^\n]+)#/includefile($1,0,2)/eg;
-  $inc =~ s/#INCLUDE_RMPKGLIST:([^#^\n]+)#/includefile($1,0,3)/eg;
-  $inc =~ s/#INCLUDE:([^#^\n]+)#/includefile($1, 0, 0)/eg;
-  $inc =~ s/#XCATVAR:([^#]+)#/envvar($1)/eg;
-  $inc =~ s/#ENV:([^#]+)#/envvar($1)/eg;
-  $inc =~ s/#MACHINEPASSWORD#/machinepassword()/eg;
-  $inc =~ s/#CRYPT:([^:]+):([^:]+):([^#]+)#/crydb($1,$2,$3)/eg;
-  $inc =~ s/#COMMAND:([^#]+)#/command($1)/eg;
-  $inc =~ s/#KICKSTARTNET#/kickstartnetwork()/eg;
-  $inc =~ s/#YAST2NET#/yast2network()/eg;
-  $inc =~ s/#ESXIPV6SETUP#/esxipv6setup()/eg;
-  $inc =~ s/#WINTIMEZONE#/xCAT::TZUtils::get_wintimezone()/eg;
-  $inc =~ s/#WINPRODKEY:([^#]+)#/get_win_prodkey($1)/eg;
-  $inc =~ s/#WINNETCFG#/windows_net_cfg()/eg;
-  $inc =~ s/#WINADJOIN#/windows_join_data()/eg;
-  $inc =~ s/#WINDNSCFG#/windows_dns_cfg()/eg;
-  $inc =~ s/#WINACCOUNTDATA#/windows_account_data()/eg;
-  $inc =~ s/#WINDISABLENULLADMIN#/windows_disable_null_admin()/eg;
-  $inc =~ s/#MANAGEDADDRESSMODE#/managed_address_mode()/eg;
-  $inc =~ s/#HOSTNAME#/$node/g;
-  $inc =~ s/#GETNODEDOMAIN:([^#]+)#/get_node_domain($1)/eg;
-
-  my $nrtab = xCAT::Table->new("noderes");
-  my $tftpserver = $nrtab->getNodeAttribs($node, ['tftpserver']);
-  my $sles_sdk_media = "http://" . $tftpserver->{tftpserver} . $media_dir . "/sdk1";
-  
-  $inc =~ s/#SLES_SDK_MEDIA#/$sles_sdk_media/eg;
-
-  #if user specify the partion file, replace the default partition strategy
-  if ($partitionfile){
-    #if the content of the partition file is definition replace the default is ok
-    my $partcontent = '';
-    my $scriptflag = 0;
-
-    if ($partitionfile =~ /^s:(.*)/){
-        $scriptflag = 1;
-        $partitionfile = $1;
-    }
-
-    if (-r $partitionfile){
-        open ($inh, "<", $partitionfile);
-        while (<$inh>){
-            $partcontent .= $_;
-        }
-        close ($inh);
-
-        #the content of the specified file is a script which can write partition definition into /tmp/partitionfile
-        if ($scriptflag){
-            #for redhat/sl/centos/kvm/fedora
-            if ($inc =~ /#XCAT_PARTITION_START#/) {
-                my $tempstr = "%include /tmp/partitionfile\n";
-                $inc =~ s/#XCAT_PARTITION_START#[\s\S]*#XCAT_PARTITION_END#/$tempstr/;
-                #modify the content in the file, and write into %pre part
-                #$partcontent = "cat > /tmp/partscript << EOFEOF\n" . $partcontent . "\nEOFEOF\n";
-                $partcontent = "echo " . "'". $partcontent . "'" . ">/tmp/partscript\n";
-               
-                $partcontent .= "chmod 755 /tmp/partscript\n";
-                $partcontent .= "/tmp/partscript\n";
-                #replace the #XCA_PARTITION_SCRIPT#
-                $inc =~ s/#XCA_PARTITION_SCRIPT#/$partcontent/;
-            }
-            #for sles/suse
-            elsif ($inc =~ /<!-- XCAT-PARTITION-START -->/){
-                my $tempstr = "<drive><device>XCATPARTITIONTEMP</device></drive>";
-                $inc =~ s/<!-- XCAT-PARTITION-START -->[\s\S]*<!-- XCAT-PARTITION-END -->/$tempstr/;
-                #$partcontent = "cat > /tmp/partscript << EOFEOF\n" . $partcontent . "\nEOFEOF\n";
-                $partcontent = "echo " . "'". $partcontent . "'" . ">/tmp/partscript\n";
-                $partcontent .= "chmod 755 /tmp/partscript\n";
-                $partcontent .= "/tmp/partscript\n";
-                $inc =~ s/#XCA_PARTITION_SCRIPT#/$partcontent/;
-            }
-        }
-        else{
-            $partcontent =~ s/\s$//;
-            if ($inc =~ /#XCAT_PARTITION_START#/){
-                $inc =~ s/#XCAT_PARTITION_START#[\s\S]*#XCAT_PARTITION_END#/$partcontent/;
-            }
-            elsif ($inc =~ /<!-- XCAT-PARTITION-START -->/){
-                $inc =~ s/<!-- XCAT-PARTITION-START -->[\s\S]*<!-- XCAT-PARTITION-END -->/$partcontent/;
-            }
-        }
-    }
+      if ($partitionfile && $doneincludes) {
+          #the content of the specified file is a script which can write partition definition into /tmp/partitionfile
+          # split the partition file out from the $inc
+          ($inc, $partcontent) = split(/FFFFFFFFFFFFPARTITIONFILESTART/, $inc);
+          if ($scriptflag){
+              # since the whole partition file needs be packaged in %pre first and generate an executable file at running time,
+              # all the special chars like ',",%,\ need be kept, we have to use the base64 coding to code it and put it in
+              # %pre and decode it out during the running time.
+              use MIME::Base64;
+              $partcontent = encode_base64($partcontent);
+              $partcontent =~ s/\n//g;
+              
+              #for redhat/sl/centos/kvm/fedora
+              if ($inc =~ /#XCAT_PARTITION_START#/) {
+                  my $tempstr = "%include /tmp/partitionfile\n";
+                  $inc =~ s/#XCAT_PARTITION_START#[\s\S]*#XCAT_PARTITION_END#/$tempstr/;
+                  # Put the base64 coded partitionfile into %pre part
+                  $partcontent = "cat > /tmp/partscript.enc << EOFEOF\n" . $partcontent . "\nEOFEOF\n";
+                  # Put the code to decode the partitionfile
+                  $partcontent .= "python -c 'import base64; print base64.b64decode(open(\"/tmp/partscript.enc\",\"rb\").read())' >/tmp/partscript\n";
+                  $partcontent .= "chmod 755 /tmp/partscript\n";
+                  $partcontent .= "/tmp/partscript\n";
+                  #replace the #XCA_PARTITION_SCRIPT#
+                  $inc =~ s/#XCA_PARTITION_SCRIPT#/$partcontent/;
+              }
+              #for sles/suse
+              elsif ($inc =~ /<!-- XCAT-PARTITION-START -->/){
+                  my $tempstr = "<drive><device>XCATPARTITIONTEMP</device></drive>";
+                  $inc =~ s/<!-- XCAT-PARTITION-START -->[\s\S]*<!-- XCAT-PARTITION-END -->/$tempstr/;
+                  # Put the base64 coded partitionfile into %pre part
+                  $partcontent = "cat > /tmp/partscript.enc << EOFEOF\n" . $partcontent . "\nEOFEOF\n";
+                  # Put the code to decode the partitionfile
+                  $partcontent .= "perl -ne 'use MIME::Base64; print decode_base64(\$_)' </tmp/partscript.enc > /tmp/partscript\n";
+                  $partcontent .= "chmod 755 /tmp/partscript\n";
+                  $partcontent .= "/tmp/partscript\n";
+                  $inc =~ s/#XCA_PARTITION_SCRIPT#/$partcontent/;
+              }
+          }
+          else{
+              $partcontent =~ s/\s$//;
+              if ($inc =~ /#XCAT_PARTITION_START#/){
+                  $inc =~ s/#XCAT_PARTITION_START#[\s\S]*#XCAT_PARTITION_END#/$partcontent/;
+              }
+              elsif ($inc =~ /<!-- XCAT-PARTITION-START -->/){
+                  $inc =~ s/<!-- XCAT-PARTITION-START -->[\s\S]*<!-- XCAT-PARTITION-END -->/$partcontent/;
+              }
+          }
+      }
   }
 
   if ($tmplerr) {
-     close ($outh);
-     return $tmplerr;
-   }
+      close ($outh);
+      return $tmplerr;
+  }
   print $outh $inc;
   close($outh);
   return 0;
@@ -663,9 +671,9 @@ sub kickstartnetwork {
       my $line = "network --onboot=yes --bootproto="; 
       my $hoststab;
       my $mactab = xCAT::Table->new('mac',-create=>0);
-      unless ($mactab) { die "mac table should always exist prior to template processing when doing autoula"; }
+      unless ($mactab) { $tmplerr ="mac table should always exist prior to template processing when doing autoula"; return;}
       my $ent = $mactab->getNodeAttribs($node,['mac'],prefetchcache=>1);
-      unless ($ent and $ent->{mac}) { die "missing mac data for $node"; }
+      unless ($ent and $ent->{mac}) { $tmplerr ="missing mac data for $node"; return;}
       my $suffix = $ent->{mac};
       $suffix = lc($suffix);
 	if ($::XCATSITEVALS{managedaddressmode} eq "autoula") {

xCAT-server/lib/perl/xCAT/WinUtils.pm

@@ -13,6 +13,13 @@ our %kmskeymap = (
 	"win8.professional_n" => "XCVCF-2NXM9-723PB-MHCB7-2RYQQ",
 	"win8.enterprise" => "32JNW-9KQ84-P47T8-D8GGY-CWCK7",
 	"win8.enterprise_n" => "JMNMF-RHW7P-DMY6X-RF3DR-X2BQT",
+    "win81.professional" => "GCRJD-8NW9H-F2CDX-CCM8D-9D6T9",
+    "win81.professional_n" => "HMCNV-VVBFX-7HMBH-CTY9B-B4FXY",
+	"win81.enterprise" => "MHF9N-XY6XB-WVXMC-BTDCT-MKKG7",
+	"win81.enterprise_n" => "TT4HM-HN7YT-62K67-RGRQJ-JFFXW",
+    "win2012r2.standard" => "D2N9P-3P6X9-2R39C-7RTCD-MDVJX",
+    "win2012r2.datacenter" => "W3GGN-FT8W3-Y4M27-J84CP-Q3VJ9",
+    "win2012r2.essentials" => "KNC87-3J2TX-XB4WP-VCPJV-M4FWM",
 	"win2012.standard" => "XC9B7-NBPP2-83J2H-RHMBY-92BT4", #note that core and non-core share KMS key
 	"win2012.datacenter" => "48HP8-DN98B-MYWDG-T2DCC-8W83P",
 	"win7.professional" => "FJ82H-XT6CR-J8D7P-XQJJ2-GPDD4",

xCAT-server/lib/xcat/monitoring/nagiosmon.pm

@@ -66,12 +66,14 @@ sub start {
     my $mychildren_cfg="/etc/nagios/objects/mychildren.cfg";
     if ($isSN) { #start nagios daemon only when mychildren exists on the sn
 	if (-f $mychildren_cfg) {
-	    my $rc=`service nagios restart 2>&1`;
+	    #my $rc=`service nagios restart 2>&1`;
+	    my $rc=xCAT::Utils->restartservice("nagios");
 	    reportError("$localhostname: $rc", $callback);
 	}
     }
     else { #always start nagios daemon on mn
-	my $rc=`service nagios restart 2>&1`;
+	#my $rc=`service nagios restart 2>&1`;
+	my $rc=xCAT::Utils->restartservice("nagios");
 	reportError("$localhostname: $rc", $callback);
     }