From 40837eb2ed90bb9f255ab4803d76b9b9e964512c Mon Sep 17 00:00:00 2001
From: xq2005 <xq2005@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 14 Sep 2012 08:01:03 +0000
Subject: [PATCH] support pkglist for ubuntu full install

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13798 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/perl/xCAT/Template.pm | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index cc7a47770..cac27ba70 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -126,17 +126,14 @@ sub subvars {
       # handle empty and non-empty $pkglistfile's
 
       if (open PKGLISTFILE, "<$pkglistfile") {
-        my $pkglist = <PKGLISTFILE>;
-        chomp $pkglist;
-
-        # substitute space-delimited package list
-        $inc =~ s/#INCLUDE_DEFAULT_PKGLIST_PRESEED#/$pkglist/g;
-
+        my $pkglist = '';
         # append preseed directive lines
         while (<PKGLISTFILE>) {
-          $inc .= $_;
+          chomp $_;
+          $pkglist .= " " . $_;
         }
 
+        $inc =~ s/#INCLUDE_DEFAULT_PKGLIST_PRESEED#/$pkglist/g;
         close PKGLISTFILE;
       }
     } else {