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

Merge pull request #67 from immarvin/master

Browse Source 
merge 2 commits from 2.9.1-pcm branch to master
This commit is contained in:
immarvin 2015-08-10 10:47:21 +08:00
commit 057ff565fc
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/data/discinfo.pm
View File

@ -35,6 +35,7 @@ require Exporter;
"1195488871.805863" => "centos4.6",
"1195487524.127458" => "centos4.6",
"1301444731.448392" => "centos5.6",
"1414159991.958686" => "centos6.6",
"1170973598.629055" => "rhelc5",
"1170978545.752040" => "rhels5",
"1192660014.052098" => "rhels5.1",
@ -55,6 +56,7 @@ require Exporter;
"1354214009.518521" => "rhels5.9", #ppc64
"1378846702.129847" => "rhels5.10", #x86_64
"1378845049.643372" => "rhels5.10", #ppc64
"1409145026.642170" => "rhels5.11",
"1285193176.460470" => "rhels6", #x86_64
"1285192093.430930" => "rhels6", #ppc64
"1305068199.328169" => "rhels6.1", #x86_64

8
xCAT-server/share/xcat/netboot/rh/genimage
View File

@ -1704,6 +1704,14 @@ sub using_systemd {
if ($1 >= 7) {
return 1;
}
}elsif ($os =~/centos(\d+)/){
if($1 >= 7){
return 1;
}
}elsif ($os =~/rhelhpc(\d+)/){
if($1 >= 7){
return 1;
}
}
return 0;