xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-15 19:01:44 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2289 from xcat2/master

Browse Source 
merge master to 2.13 for 2.13 release
This commit is contained in:
Xiaopeng Wang
2016-12-07 17:27:31 +08:00
committed by GitHub
parent 99da40c22a 8cdc81ac55
commit baf1b4b73d
9 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/Utils.pm
View File

@ -4817,7 +4817,7 @@ sub acquire_lock_imageop {
my $lock = xCAT::Utils->acquire_lock("$mylockfile", $NON_BLOCK);
unless ($lock){
my $pidfd;
open($pidfd,"<","/var/run/lock/xcat/$mylockfile");
open($pidfd,"<","/var/lock/xcat/$mylockfile");
my $pid=<$pidfd>;
close($pidfd);
return (1, "failed to acquire lock, seems there is another genimage/packimage/rmimage process $pid running on root image dir \"$rootimg_dir\"");

20
xCAT-buildkit/bin/buildkit
View File

@ -1390,7 +1390,10 @@ sub validate_bldkitconf
$full_kitname .= '-' . $::bldkit_config->{kit}{entries}[0]->{osmajorversion};
}
if (defined($::bldkit_config->{kit}{entries}[0]->{osminorversion})) {
my $kitminor = split /<=|>=|==|<|>/, $::bldkit_config->{kit}{entries}[0]->{osminorversion};
my $kitminor = $::bldkit_config->{kit}{entries}[0]->{osminorversion};
unless ($kitminor =~ /^\d/) {
$kitminor = split /<=|>=|==|<|>|=/, $::bldkit_config->{kit}{entries}[0]->{osminorversion};
}
if ((!defined($::bldkit_config->{kit}{entries}[0]->{osbasename})) ||
(!defined($::bldkit_config->{kit}{entries}[0]->{osmajorversion}))) {
print "Error: Kit osminorversion attribute was specified but either Kit osbasename or Kit osmajorversion were not set. \n";
@ -1501,7 +1504,10 @@ sub validate_bldkitconf
}
$reponame .= '-' . $kr->{osmajorversion};
if (defined($kr->{osminorversion})) {
my $krminor = split /<=|>=|==|<|>/, $kr->{osminorversion};
my $krminor = $kr->{osminorversion};
unless ($krminor =~ /^\d/) {
$krminor = split /<=|>=|==|<|>|=/, $kr->{osminorversion};
}
if ((defined($::bldkit_config->{kit}{entries}[0]->{osminorversion})) &&
($::bldkit_config->{kit}{entries}[0]->{osminorversion} ne
$kr->{osminorversion})) {
@ -1552,7 +1558,10 @@ sub validate_bldkitconf
$compname .= '-' . $repo{osbasename};
$compname .= '-' . $repo{osmajorversion};
if (defined($repo{osminorversion})) {
my $minorversion = split /<=|>=|==|<|>/, $repo{osminorversion};
my $minorversion = $repo{osminorversion};
unless ($minorversion =~ /^\d/) {
$minorversion = split /<=|>=|==|<|>|=/, $repo{osminorversion};
}
$compname .= '.' . $minorversion;
}
$compname .= '-' . $repo{osarch};
@ -1937,7 +1946,10 @@ sub validate_os
my $repo_osinfo = "$repo->{osbasename}$repo->{osmajorversion}";
my $minorversion;
if (defined($repo->{osminorversion})) {
$minorversion = split /<=|>=|==|<|>/, $repo->{osminorversion};
$minorversion = $repo->{osminorversion};
unless ($minorversion =~ /^\d/) {
$minorversion = split /<=|>=|==|<|>|=/, $repo->{osminorversion};
}
$repo_osinfo .= ".$minorversion";
}
$repo_osinfo .= "-$repo->{osarch} ";

2
xCAT-genesis-scripts/debian/control-amd64
View File

@ -7,7 +7,7 @@ Standards-Version: 3.9.2
Package: xcat-genesis-scripts-amd64
Architecture: all
Depends: xcat-genesis-base-amd64
Depends: xcat-genesis-base-amd64 (>=2.13.0)
Conflicts: xcat-genesis-scripts,xcat-genesis-scripts-x86-64
Replaces: xcat-genesis-scripts,xcat-genesis-scripts-x86-64
Description: xCAT genesis

2
xCAT-genesis-scripts/debian/control-ppc64el
View File

@ -7,7 +7,7 @@ Standards-Version: 3.9.2
Package: xcat-genesis-scripts-ppc64
Architecture: all
Depends: xcat-genesis-base-ppc64
Depends: xcat-genesis-base-ppc64 (>=2.13.0)
Conflicts: xcat-genesis-scripts
Replaces: xcat-genesis-scripts
Description: xCAT genesis

2
xCAT-genesis-scripts/xCAT-genesis-scripts.spec
View File

@ -31,7 +31,7 @@ Vendor: IBM Corp
Summary: xCAT Genesis netboot image - Core content
URL: http://xcat.org
Source1: xCAT-genesis-scripts.tar.bz2
Requires: xCAT-genesis-base-%{tarch}
Requires: xCAT-genesis-base-%{tarch} >= 2:2.13.0
Buildroot: %{_localstatedir}/tmp/xCAT-genesis
Packager: IBM Corp.

3
xCAT-server/lib/xcat/plugins/makentp.pm
View File

@ -454,11 +454,12 @@ sub process_request {
},
$sub_req, -1, 1
);
my $retcode=$::RUNCMD_RC;
my $msg;
foreach my $line (@$ret) {
$msg .= "$line\n";
}
send_msg(\%request, 1, "$msg");
send_msg(\%request, $retcode, "$msg");
}
}

2
xCAT-test/autotest/testcase/buildkit/cases0
View File

@ -103,6 +103,7 @@ cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit;buildkit create pro
check:rc==0
cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit;buildkit buildrepo all
check:rc==0
check:output!~error
cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir
check:output=~prodkit-1.0-1
cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir/prodkit-1.0-1-*
@ -153,6 +154,7 @@ cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit;buildkit create pro
check:rc==0
cmd:cd /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit;reponame=`cat buildkit.conf|grep kitrepoid|sed 's/ //g' |grep ^kitrepoid=|head -1|awk -F= '{print $2}'`;buildkit buildrepo $reponame
check:rc==0
check:output!~error
cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir
check:output=~prodkit-1.0-1
cmd:ls /opt/xcat/share/xcat/tools/autotest/testcase/buildkit/prodkit/build/kit_repodir/prodkit-1.0-1-*

2
xCAT-test/autotest/testcase/genesis/genesistest.pl
View File

@ -266,7 +266,7 @@ sub testxdsh {
$checkstring = "testimg";
$checkfile = "/tmp/testresult";
} elsif ($value == 3) {
$checkstring = "xcatd=$master:3001";
$checkstring = "destiny=shell";
$checkfile = "/proc/cmdline";
}
if (($value == 1) || ($value == 2) || ($value == 3)) {

5
xCAT-test/autotest/testcase/installation/SN_setup_case
View File

@ -34,7 +34,7 @@ cmd:chdef -t node $$SN groups=service,all
check:rc==0
cmd:chdef -t group -o service profile=service primarynic=mac installnic=mac
check:rc==0
cmd:chdef -t group -o service setupnfs=1 setupdhcp=1 setuptftp=1 setupnameserver=1 setupconserver=1
cmd:chdef -t group -o service setupnfs=1 setupdhcp=1 setuptftp=1 setupnameserver=1 setupconserver=1 setupntp=1
check:rc==0
cmd:chdef -t group -o service nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN monserver=$$MN
check:rc==0
@ -96,5 +96,6 @@ check:output=~/tftpboot on /tftpboot
cmd:if [[ "__GETNODEATTR($$SN,arch)__" =~ "x86_64" ]]; then if [[ "__GETNODEATTR($$SN,os)__" =~ "sles" ]];then xdsh $$SN "zypper -n install perl-Sys-Virt"; elif [[ "__GETNODEATTR($$SN,os)__" =~ "rh" ]];then xdsh $$SN "yum install -y perl-Sys-Virt";fi;fi
check:rc==0
cmd:makentp -a
check:rc==0
end