xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-21 19:22:05 +00:00
Code Issues Releases Wiki Activity

Try again to get these updates to GitHub

Browse Source 
Change-Id: If6a162c43ae9a1c51070dec304de9fd372181933
This commit is contained in:
Chuck Brazie 2017-05-03 11:41:54 -04:00
parent 6a1fba3de4
commit 1ca12b3baf
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Release Normal file
View File

@ -0,0 +1 @@
snap000000000000

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

@ -2224,11 +2224,19 @@ sub osver
$os = $id_like;
}
if (!$os ) {
$os = "unknown";
}
$verrel = $version;
if (!$verrel and $version_id) {
$verrel = $version_id;
}
if (!$verrel ) {
$verrel = "unknown";
}
if (!$name and $prettyname) {
$name = $prettyname;

2
xCAT-UI/lib/functions.php
View File

@ -299,7 +299,7 @@ function isAuthenticated() {
*/
function isRootAcess() {
if (is_logged() && $_SESSION["xcatpassvalid"]) {
$testacc = docmd('tabdump', '', array('policy', '-w', "name==" . $_SESSION["username"]), array());
$testacc = docmd('tabdump', '', array('-w', "name==" . $_SESSION["username"],'policy' ), array());
if (isset($testacc->{'xcatresponse'}->{'data'}->{1})) {
$result = $testacc->{'xcatresponse'}->{'data'}->{1};
$result = str_replace('"', '', $result);

23
xCAT/xCAT.spec
View File

@ -29,12 +29,6 @@ Requires: perl-DBD-SQLite
Requires: xCAT-client = 4:%{version}-%{release}
Requires: xCAT-server = 4:%{version}-%{release}
%ifnarch s390x
Requires: xCAT-probe = 4:%{version}-%{release}
Requires: xCAT-genesis-scripts-x86_64 = 1:%{version}-%{release}
Requires: xCAT-genesis-scripts-ppc64 = 1:%{version}-%{release}
%endif
%define pcm %(if [ "$pcm" = "1" ];then echo 1; else echo 0; fi)
%define notpcm %(if [ "$pcm" = "1" ];then echo 0; else echo 1; fi)
@ -44,6 +38,13 @@ Requires: xCAT-genesis-scripts-ppc64 = 1:%{version}-%{release}
# Define a different location for various httpd configs in s390x mode
%define httpconfigdir %(if [ "$s390x" = "1" ];then echo "xcathttpdsave"; else echo "xcat"; fi)
%if %nots390x
Requires: xCAT-probe = 4:%{version}-%{release}
Requires: xCAT-genesis-scripts-x86_64 = 1:%{version}-%{release}
Requires: xCAT-genesis-scripts-ppc64 = 1:%{version}-%{release}
%endif
%ifos linux
Requires: httpd nfs-utils nmap bind perl(CGI)
# on RHEL7, need to specify it explicitly
@ -53,7 +54,7 @@ Requires: /usr/bin/killall
Requires: /usr/sbin/dhcpd
# On RHEL this pulls in openssh-server, on SLES it pulls in openssh
Requires: /usr/bin/ssh
%ifnarch s390x
%if %nots390x
Requires: /etc/xinetd.d/tftp
Requires: xCAT-buildkit
# Stty is only needed for rcons on ppc64 nodes, but for mixed clusters require it on both x and p
@ -64,7 +65,7 @@ Requires: perl-IO-Stty
# The aix rpm cmd forces us to do this outside of ifos type stmts
%if %notpcm
%ifos linux
%ifnarch s390x
%if %nots390x
# PCM does not use or ship conserver
Requires: conserver-xcat
%endif
@ -72,7 +73,7 @@ Requires: conserver-xcat
%endif
#support mixed cluster
%ifnarch s390x
%if %nots390x
Requires: elilo-xcat xnba-undi
%endif
@ -89,7 +90,7 @@ Requires: ipmitool-xcat >= 1.8.17-1
%if %notpcm
# PCM does not need or ship syslinux-xcat
%ifnarch s390x
%if %nots390x
Requires: syslinux-xcat
%endif
%endif
@ -264,7 +265,7 @@ exit 0
/install/postscripts
/install/prescripts
%ifos linux
%config /etc/logrotate.d/xcat
/etc/logrotate.d/xcat
/etc/rsyslog.d/xcat-cluster.conf
/etc/rsyslog.d/xcat-compute.conf
/etc/rsyslog.d/xcat-debug.conf