[Xcat-commit] [xcat-core] xCAT branch 2.8.2-pcm updated. 623541a90d37ac77f7a4bc3a81476e69159e3e52

[XiaoPeng W. <xca...@so...>]

The branch, 2.8.2-pcm has been updated
       via  623541a90d37ac77f7a4bc3a81476e69159e3e52 (commit)
       via  57a863d84e7894a724341bf14628b129913cfb26 (commit)
      from  265d627b56f8b0f31fff3ce363d5103d3be5e675 (commit)

-----------------------------------------------------------------------
commit 623541a90d37ac77f7a4bc3a81476e69159e3e52
Merge: 57a863d 265d627
Author: daniceexi <wx...@cn...>
Date:   Tue Dec 23 05:43:10 2014 -0500

    Merge branch '2.8.2-pcm' of ssh://dan...@gi.../p/xcat/xcat-core into 2.8.2-pcm

commit 57a863d84e7894a724341bf14628b129913cfb26
Author: daniceexi <wx...@cn...>
Date:   Sun Dec 14 05:18:55 2014 -0500

    defect 4467: In Template.pm, fix the issue that added a emptry line at the head of the parition script which causes the partition script cannot find correct shell interpreter

-----------------------------------------------------------------------
diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 96386e6..69a4fea 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -260,7 +260,7 @@ sub subvars {
       if ($partitionfile && $doneincludes) {
           #the content of the specified file is a script which can write partition definition into /tmp/partitionfile
           # split the partition file out from the $inc
-          ($inc, $partcontent) = split(/FFFFFFFFFFFFPARTITIONFILESTART/, $inc);
+          ($inc, $partcontent) = split(/FFFFFFFFFFFFPARTITIONFILESTART\n/, $inc);
           if ($scriptflag){
               # since the whole partition file needs be packaged in %pre first and generate an executable file at running time,
               # all the special chars like ',",%,\ need be kept, we have to use the base64 coding to code it and put it in