defect #4026, allow for SN facing ip to be seen

perl-xCAT/modifyUtils

@@ -1,20 +1,21 @@
 #!/bin/sh
 # Put the version, svn revision #, and build date into the Version function in Version.pm
 
-if [ -z "$1" ]
+if [ -z "$2" ]
 	then
 	echo "modifyUtils:  Error:  must specify the xCAT version as an argument" >&2
 	exit
 fi
 
 VER=$1
+GITREF="git commit $2, "
 
 BUILDDATE=`date`
 #echo ". '(built $BUILDDATE)'"
 
 if [ "$(uname)" = "AIX" ]
 then
-	sed -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (built $BUILDDATE)'"/ xCAT/Version.pm >xCAT/Version.pm.new
+	sed -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (${GITREF}built $BUILDDATE)'"/ xCAT/Version.pm >xCAT/Version.pm.new
 	mv xCAT/Version.pm.new xCAT/Version.pm
 else
         if [ -f "/etc/debian_version" ];then
@@ -22,5 +23,5 @@ else
         else
             FILENAME="xCAT/Version.pm"
         fi
-	sed -i -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (built $BUILDDATE)'"/ $FILENAME
+	sed -i -e s/"#XCATVERSIONSUBHERE"/". '$VER'"/ -e s/"#XCATSVNBUILDSUBHERE"/". ' (${GITREF}built $BUILDDATE)'"/ $FILENAME
 fi

perl-xCAT/perl-xCAT.spec

@@ -23,6 +23,8 @@ Provides: perl-xCAT = %{epoch}:%{version}
 Provides perl xCAT libraries for core functionality.  Required for all xCAT installations.
 Includes xCAT::Table, xCAT::NodeRange, among others.
 
+%define gitinfo %(git log -n 1 | head -n 1 | cut -f 2 -d ' ')
+
 %define zvm %(if [ "$zvm" = "1" ];then echo 1; else echo 0; fi)
 %define fsm %(if [ "$fsm" = "1" ];then echo 1; else echo 0; fi)
 
@@ -36,7 +38,7 @@ Includes xCAT::Table, xCAT::NodeRange, among others.
 %if %fsm
 %else
 # Modify the Version() function in xCAT/Utils.pm to automatically have the correct version
-./modifyUtils %{version}
+./modifyUtils %{version} %{gitinfo}
 
 # Build the pod version of the man pages for each DB table.  It puts them in the man5 and man7 subdirs.
 # Then convert the pods to man pages and html pages.

perl-xCAT/xCAT/zvmUtils.pm

@@ -2405,7 +2405,7 @@ sub getFreeRepoSpace {
     if ($master eq $ip) {
         # If the master IP and node IP match, then it is the management node
         my $out = `$sudo /bin/df -h /install | sed 1d`;
-        $out =~ s/\h+/ /g;
+        # causing problems on other platforms $out =~ s/\h+/ /g;
         my @results = split(' ', $out);
         if ( $results[3] eq "0" ) {
             $results[3] = "0M";

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

@@ -1394,7 +1394,7 @@ sub  collect_all_attribs_for_tables_in_template
                                   $::GLOBAL_TAB_HASH{$tabname}{$node}{$attrib} = $ent->{$node}->[0]->{$attrib};
                                   
                                   #for noderes.xcatmaster
-                                  if ($tabname =~ /^noderes$/ && $attrib =~ /^xcatmaster$/ && ! exists($::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster}))
+                                  if ($tabname =~ /^noderes$/ && $attrib =~ /^xcatmaster$/ && $::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster} == "")
                                   {
                                       my $value;
                                       $value = xCAT::NetworkUtils->my_ip_facing($node);

xCAT-server/lib/xcat/plugins/destiny.pm

@@ -326,7 +326,9 @@ sub setdestiny {
 		       noupdateinitrd=>$noupdateinitrd,
                        ignorekernelchk=>$ignorekernelchk,}, \&relay_response);
 	    if ($errored) { 
-		$callback->({error=>"Some nodes failed to set up $state resources, aborting"});
+                my @myself = xCAT::NetworkUtils->determinehostname();
+                my $myname = $myself[(scalar @myself)-1];
+		$callback->({error=>"Some nodes failed to set up $state resources on server $myname, aborting"});
 		return; 
 	    }
 	

xCAT-server/lib/xcat/plugins/dhcp.pm

@@ -881,8 +881,8 @@ sub check_options
         xCAT::MsgUtils->message("I", $rsp, $callback, 0);
         return 0;
     }
-    # if not help,  dhcpd needs to be running
-    if (!($opt->{h})) {
+    # if not help and not -n,  dhcpd needs to be running
+    if (!($opt->{h})&& (!($opt->{n}))) {
      if (xCAT::Utils->isLinux()) {
        my @output = xCAT::Utils->runcmd("service dhcpd status", -1);
        if ($::RUNCMD_RC != 0)  { # not running

xCAT-server/lib/xcat/plugins/route.pm

@@ -614,11 +614,7 @@ sub set_route {
             }
         } else {
             if (xCAT::Utils->isLinux()) {
-	        if ( $gw_ip == "" || $gw_ip == "0.0.0.0" ) {
-                    $cmd="route add -net $net netmask $mask dev $ifname";
-		} else {
-                    $cmd="route add -net $net netmask $mask gw $gw_ip";
-		}
+                $cmd="route add -net $net netmask $mask gw $gw_ip";
             } else {
                 $cmd="route add -net $net -netmask $mask $gw_ip";
             }
@@ -970,7 +966,7 @@ sub addPersistentRoute_RH {
     if ($net =~ /:/) {
         $filename="/etc/sysconfig/static-routes-ipv6";
     } else {
-        $filename="/etc/sysconfig/sysconfig/route-$ifname";
+        $filename="/etc/sysconfig/static-routes";
     }
     my @output=getConfig($filename);
     #print "old output=" . join("\n", @output) . "\n";
@@ -991,7 +987,7 @@ sub addPersistentRoute_RH {
 
         $new_config="$ifname $net/$mask $gw_ip";
     } else {
-        $new_config="$net/$mask via $gw_ip dev $ifname\n";
+        $new_config="any net $net netmask $mask gw $gw_ip $ifname\n";
     }
     if (!$hasConfiged) {
 	push(@output, $new_config);
@@ -1028,7 +1024,7 @@ sub deletePersistentRoute_RH {
     if ($net =~ /:/) {
         $filename="/etc/sysconfig/static-routes-ipv6";
     } else {
-        $filename="/etc/sysconfig/network-scripts/route-$ifname";
+        $filename="/etc/sysconfig/static-routes";
     }
     my @output=getConfig($filename);
     #print "old output=" . join("\n", @output) . "\n";
@@ -1050,7 +1046,7 @@ sub deletePersistentRoute_RH {
     if ($net =~ /:/) {
         $rsp->{data}->[0]= "$host: Removed persistent route \"$ifname $net/$mask $gw_ip\" from $filename.";
     } else {
-        $rsp->{data}->[0]= "$host: Removed persistent route \"$net/$mask via $gw_ip dev $ifname\" from $filename.";
+        $rsp->{data}->[0]= "$host: Removed persistent route \"any net $net netmask $mask gw $gw_ip $ifname\" from $filename.";
     }
 	$callback->($rsp);
     } else {
@@ -1058,7 +1054,7 @@ sub deletePersistentRoute_RH {
     if ($net =~ /:/) {
 	    $rsp->{data}->[0]= "$host: Persistent route \"$ifname $net/$mask $gw_ip\" does not exist in $filename.";
     } else {
-	    $rsp->{data}->[0]= "$host: Persistent route \"$net/$mask via $gw_ip dev $ifname\" does not exist in $filename.";
+	    $rsp->{data}->[0]= "$host: Persistent route \"any net $net netmask $mask gw $gw_ip $ifname\" does not exist in $filename.";
     }
 	$callback->($rsp);
     }
@@ -1129,11 +1125,7 @@ sub addPersistentRoute_Debian{
     }
     else { #ipv4
         $cmd = "grep \"-net $net netmask $mask gw $gw_ip\" $conf_file";
-	if ( $gw_ip == "" || $gw_ip == "0.0.0.0" ) {
-            $route_conf = "  up route add -net $net netmask $mask dev $ifname \n  down route del -net $net netmask $mask dev $ifname\n";
-	} else {
-            $route_conf = "  up route add -net $net netmask $mask gw $gw_ip \n  down route del -net $net netmask $mask gw $gw_ip\n";
-	}
+        $route_conf = "  up route add -net $net netmask $mask gw $gw_ip \n  down route del -net $net netmask $mask gw $gw_ip \n";
     }
 
     #fine the corresponding config in the config file

xCAT-server/sbin/xcatd

@@ -323,35 +323,42 @@ sleep 0.05; #up to 50 ms outage possible
     my $conn;
     next unless $conn = $socket->accept;
 
-my @clients;
-if ($inet6support) {
-    @clients = gethostbyaddr($conn->peeraddr,AF_INET6);
-    unless (@clients) { @clients =  gethostbyaddr($conn->peeraddr,AF_INET); }
-} else {
-    @clients = gethostbyaddr($conn->peeraddr,AF_INET);
-}
+    my $client_name;
+    my $client_aliases;
+    my @clients;
+    if ($inet6support) {
+        ($client_name,$client_aliases) = gethostbyaddr($conn->peeraddr,AF_INET6);
+        unless ($client_name) { ($client_name,$client_aliases) =  gethostbyaddr($conn->peeraddr,AF_INET); }
+    } else {
+        ($client_name,$client_aliases) = gethostbyaddr($conn->peeraddr,AF_INET);
+    }
+
+    $clients[0] = $client_name;
+    if ($client_aliases) {
+       push @clients, split(/\s+/,$client_aliases);
+    }
 
 	my $validclient=0;
 	my $node;
 	my $domain;
 
-	my $nd = xCAT::NetworkUtils->getNodeDomains(\@clients);
-	my %nodedomains = %{$nd};
-
 	foreach my $client (@clients) {
-		$domain = $nodedomains{$client};
+            my @ndn = ($client);
+	    my $nd = xCAT::NetworkUtils->getNodeDomains(\@ndn);
+	    my %nodedomains = %{$nd};
+	    $domain = $nodedomains{$client};
+  	    $client =~ s/\..*//;
+	    if ($domain) {
+		$client =~ s/\.$domain//;
+ 	    } else {
 		$client =~ s/\..*//;
-		if ($domain) {
-			$client =~ s/\.$domain//;
-		} else {
-			$client =~ s/\..*//;
-		}
-		#ensure this is coming from a node IP at least
-		($node) = noderange($client);
-		if ($node) {  #Means the source isn't valid
-			$validclient=1;
-			last;
-		}
+	    }
+	    #ensure this is coming from a node IP at least
+	    ($node) = noderange($client);
+	    if ($node) {  #Means the source isn't valid
+		$validclient=1;
+		last;
+	    }
 	}
 
     unless ($validclient) {

xCAT/postscripts/routeop

@@ -240,13 +240,8 @@ add_persistent_route()
                             echo "  up route -A inet6 add $net/$mask gw $gw" >> $tempfile
                             echo "  down route -A inet6 del $net/$mask gw $gw" >> $tempfile
                         else
-			    if [ "$gw" = "" -o "$gw" = "0.0.0.0" ] ; then
-                                echo "  up route add -net $net netmask $mask dev $ifname" >> $tempfile
-                                echo "  down route del -net $net netmask $mask dev $ifname" >> $tempfile
-			    else
-                                echo "  up route add -net $net netmask $mask gw $gw" >> $tempfile
-                                echo "  down route del -net $net netmask $mask gw $gw" >> $tempfile
-			    fi
+                            echo "  up route add -net $net netmask $mask gw $gw" >> $tempfile
+                            echo "  down route del -net $net netmask $mask gw $gw" >> $tempfile
                         fi
                     fi
                     echo $LINE | grep "iface $ifname " 2>&1 1>/dev/null
@@ -263,13 +258,8 @@ add_persistent_route()
                         echo "  up route -A inet6 add $net/$mask gw $gw" >> $tempfile
                         echo "  down route -A inet6 del $net/$mask gw $gw" >> $tempfile
                     else
-		        if [ "$gw" = "" -o "$gw" = "0.0.0.0" ] ; then
-                            echo "  up route add -net $net netmask $mask dev $ifname" >> $tempfile
-                            echo "  down route del -net $net netmask $mask dev $ifname" >> $tempfile
-			else
-                            echo "  up route add -net $net netmask $mask gw $gw" >> $tempfile
-                            echo "  down route del -net $net netmask $mask gw $gw" >> $tempfile
-			fi
+                        echo "  up route add -net $net netmask $mask gw $gw" >> $tempfile
+                        echo "  down route del -net $net netmask $mask gw $gw" >> $tempfile
                     fi 
                 fi
                 mv -f $tempfile $filename
@@ -288,9 +278,9 @@ add_persistent_route()
             # $net/mask does not work with sed cmd
             route1="$ifname $net\/$mask $gw";
         else
-            filename="/etc/sysconfig/network-scripts/route-$ifname";
-            route="$net/$mask via $gw dev $ifname";
-            route1="$net\/$mask via $gw dev $ifname";
+            filename="/etc/sysconfig/static-routes";
+            route="any net $net netmask $mask gw $gw $ifname";
+            route1="any net $net netmask $mask gw $gw $ifname";
         fi
         if [ -f $filename ]; then
             grep "$route" $filename 2>&1 1>/dev/null
@@ -410,9 +400,9 @@ rm_persistent_route()
             route="$ifname $net\/$mask $gw"
             route1="$ifname $net/$mask $gw"
         else
-            filename="/etc/sysconfig/network-scripts/route-$ifname";
-            route="$net/$mask via $gw dev $ifname";
-            route1="$net\/$mask via $gw dev $ifname";
+            filename="/etc/sysconfig/static-routes";
+            route="any net $net netmask $mask gw $gw $ifname";
+            route1="any net $net netmask $mask gw $gw $ifname";
         fi
         if [ -f $filename ]; then
             grep "$route" $filename 2>&1 1>/dev/null
@@ -448,11 +438,7 @@ if [ "$op" = "add" ]; then
             fi
         else
             if [ "$(uname -s)" = "Linux" ]; then
-	        if [ "$gw" = "" -o "$gw" = "0.0.0.0" ] ; then
-                  cmd="route add -net $net netmask $mask dev $ifname"
-		else	
-                  cmd="route add -net $net netmask $mask gw $gw"
-		fi
+                cmd="route add -net $net netmask $mask gw $gw"
             else 
                 cmd="route add -net $net -netmask $mask $gw"
             fi