Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core

buildcore.sh

@@ -37,6 +37,7 @@
 #        EMBED=<embedded-environment> - the environment for which a minimal version of xcat should be built, e.g. zvm or flex
 #        VERBOSE=1 - to see lots of verbose output
 #        LOG=<filename> - provide an LOG file option to redirect some output into log file
+#        RPMSIGN=0 or RPMSIGN=1 - Sign the RPMs using the keys on GSA, the default is to sign the rpms without RPMSIGN specified
 
 # you can change this if you need to
 UPLOADUSER=litingt
@@ -370,7 +371,7 @@ if [ ! -z ${LOG} ]; then
 fi
 
 # get gpg keys in place
-if [ "$OSNAME" != "AIX" ]; then
+if [ "$OSNAME" != "AIX" ] && ( [ -z "$RPMSIGN" ] || [ "$RPMSIGN" == "1" ] ); then
 	mkdir -p $HOME/.gnupg
 	for i in pubring.gpg secring.gpg trustdb.gpg; do
 		if [ ! -f $HOME/.gnupg/$i ] || [ `wc -c $HOME/.gnupg/$i|cut -f 1 -d' '` == 0 ]; then

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

@@ -2078,6 +2078,7 @@ sub putmyselffirst {
 sub addnet6
 {
     if ($::XCATSITEVALS{externaldhcpservers}) { return; }
+    if (!$usingipv6) { return; }
     my $netentry = shift;
     my $net = $netentry->{net};
     my $iface = $netentry->{iface};

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

@@ -2840,6 +2840,7 @@ sub setboot {
     $running_tasks{$task}->{task} = $task;
     $running_tasks{$task}->{callback} = \&generic_task_callback;
     $running_tasks{$task}->{hyp} = $args{hyp}; 
+    $running_tasks{$task}->{vm} = $args{node}; 
     $running_tasks{$task}->{data} = { node => $node, successtext => ${$args{exargs}}[0] }; 
 }
 sub register_vm {#Attempt to register existing instance of a VM

xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat

@@ -25,7 +25,8 @@ check:output=~$$CN
 
 cmd:copycds $$ISO
 check:rc==0
-
+cmd:mkdef $$STATELITE -u profile=compute provmethod=statelite
+cmd:mkdef $$STATELESS -u profile=compute provmethod=netboot
 cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
 check:rc==0
 cmd:lsdef $$CN |grep provmethod