xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-30 18:05:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request #17 from chuckbrazie/ZVM_XCAT_DEV_RemoveElilo

Browse Source 
remove elilo from spec files, remove aa from line 277 in
This commit is contained in:
Chuck Brazie
2017-02-24 14:04:49 -05:00
committed by GitHub
parent 05ae41dd03 1166d003ad
commit f205e85dcb
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/lib/xcat/plugins/zvmdiagnostics.pm
View File

@ -274,7 +274,7 @@ sub collectDiags {
#TODO If file not found ("should never happen"), log error but continue
while (<FILE>) {
# Find record in file with NOTIFY=something on it, optionally delimited with whitespace
next unless ( /^[\s]*$NOTIFY_KEYWORD[\s]*$NOTIFY_KEYWORD_DELIMITER[\s]*(\S+)[\s]*$/iaa );
next unless ( /^[\s]*$NOTIFY_KEYWORD[\s]*$NOTIFY_KEYWORD_DELIMITER[\s]*(\S+)[\s]*$/i );
$xcatnotify_found = 1;
$xcatnotify = $1; # First parenthesized expression in regex above, that is: \S+
if ( $DEBUGGING == 1 ) {

2
xCAT/xCAT.spec
View File

@ -69,7 +69,9 @@ Requires: conserver-xcat
%endif
#support mixed cluster
%ifnarch s390x
Requires: elilo-xcat xnba-undi
%endif
%ifarch i386 i586 i686 x86 x86_64
Requires: syslinux

2
xCATsn/xCATsn.spec
View File

@ -57,7 +57,9 @@ Requires: conserver-xcat
%endif
#support mixed cluster
%ifnarch s390x
Requires: elilo-xcat xnba-undi
%endif
%ifarch i386 i586 i686 x86 x86_64
Requires: syslinux