From 5942dfdc99b42939238ea52a196a32c5dd70e187 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 20 Jun 2016 03:08:00 -0400 Subject: [PATCH 1/4] Check if the postscript is only for diskless --- xCAT-server/lib/xcat/plugins/kit.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/kit.pm b/xCAT-server/lib/xcat/plugins/kit.pm index d9f32a853..81525eaef 100644 --- a/xCAT-server/lib/xcat/plugins/kit.pm +++ b/xCAT-server/lib/xcat/plugins/kit.pm @@ -436,6 +436,13 @@ sub assign_to_osimage } if ( $osimagetable->{provmethod} =~ /install/ ) { + # If the script is only for diskless node + my $cmd = "grep \"#FLAG FOR DISKLESS ONLY#\" $installdir/postscripts/$kitcompscript"; + my $res = xCAT::Utils->runcmd($cmd, -1); + if ($res eq "#FLAG FOR DISKLESS ONLY#"){ + next; + } + # for diskfull node my $match = 0; my @scripts = split ',', $osimagetable->{postbootscripts}; From e48a9c4599ba5ff9c499dcc33bf9ddcbe3ded87f Mon Sep 17 00:00:00 2001 From: root Date: Mon, 20 Jun 2016 03:57:37 -0400 Subject: [PATCH 2/4] support buildkit for centos mn --- xCAT-buildkit/bin/buildkit | 3 +++ xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit index 2caafaa2d..8944b1f49 100755 --- a/xCAT-buildkit/bin/buildkit +++ b/xCAT-buildkit/bin/buildkit @@ -1184,6 +1184,9 @@ sub edit_bldkitconf if ($debianflag){ s/(filename=.*?)\-(.*)\.noarch\.rpm/$1_$2_all.deb/; } + if ($osbasename =~ /rh/){ + s/.*<<>>/ compat_osbasenames=centos/; + } } # Write the buildkit.conf back out diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf index 5f375942a..edeeb644b 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf @@ -107,7 +107,7 @@ kitrepo: osmajorversion=<<>> osminorversion=<<>> osarch=<<>> - # compat_osbasenames= + # compat_osbasenames=<<>> # # kitcomponent: This stanza defines one Kit Component. # There can be zero or more kitcomponent stanzas. From 785f75f82572c432fbb8aed5700aec520bdb743f Mon Sep 17 00:00:00 2001 From: root Date: Mon, 20 Jun 2016 07:06:18 -0400 Subject: [PATCH 3/4] fix a typo --- perl-xCAT/xCAT/ProfiledNodeUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/ProfiledNodeUtils.pm b/perl-xCAT/xCAT/ProfiledNodeUtils.pm index bf8a88547..0148aa664 100644 --- a/perl-xCAT/xCAT/ProfiledNodeUtils.pm +++ b/perl-xCAT/xCAT/ProfiledNodeUtils.pm @@ -1356,7 +1356,7 @@ sub gen_chain_for_profiles{ } if ((exists $netprofileattr->{"bmc"}) and $hw_reconfig){ - if ((($netboot eq 'petitboot') and ($comments eq 'openpower')) or ($netboot ne 'petiboot')) + if ((($netboot eq 'petitboot') and ($comments eq 'openpower')) or ($netboot ne 'petitboot')) { if (index($final_chain, "runcmd=bmcsetup") == -1){ $final_chain = 'runcmd=bmcsetup,'.$final_chain.':reboot4deploy'; From 90cede03a7ca238c0947675a364c45b72d8b6b83 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 20 Jun 2016 23:13:34 -0400 Subject: [PATCH 4/4] Add the centos7.2-ppc64's discinfo --- perl-xCAT/xCAT/data/discinfo.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-xCAT/xCAT/data/discinfo.pm b/perl-xCAT/xCAT/data/discinfo.pm index e44fcdb6e..1520f34e9 100755 --- a/perl-xCAT/xCAT/data/discinfo.pm +++ b/perl-xCAT/xCAT/data/discinfo.pm @@ -21,6 +21,7 @@ require Exporter; "1438724467.511049" => "centos6.7",#x86_64 "1404489053.504589" => "centos7.0", "1427495138.035654" => "centos7.1", + "1450147276.351714" => "centos7.2", #ppc64le "1176234647.982657" => "centos5", "1156364963.862322" => "centos4.4", "1178480581.024704" => "centos4.5",