From 0be60e14a1ac3d9af1940de51a1264fff4861c62 Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 15 Apr 2010 18:31:46 +0000
Subject: [PATCH] big fix

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5783 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/perl/xCAT/Template.pm        | 14 +++++++-------
 xCAT-server/share/xcat/netboot/rh/genimage   |  4 ++--
 xCAT-server/share/xcat/netboot/sles/genimage |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 8262beb55..2796563c6 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -68,13 +68,13 @@ sub subvars {
   my $doneincludes=0;
   while (not $doneincludes) {
     $doneincludes=1;
-    if ($inc =~ /#INCLUDE_PKGLIST:[^#]+#/) {
+    if ($inc =~ /#INCLUDE_PKGLIST:[^#^\n]+#/) {
       $doneincludes=0;
-      $inc =~ s/#INCLUDE_PKGLIST:([^#]+)#/includefile($1, 0, 1)/eg;
+      $inc =~ s/#INCLUDE_PKGLIST:([^#^\n]+)#/includefile($1, 0, 1)/eg;
     }
-    if ($inc =~ /#INCLUDE:[^#]+#/) {
+    if ($inc =~ /#INCLUDE:[^#^\n]+#/) {
       $doneincludes=0;
-      $inc =~ s/#INCLUDE:([^#]+)#/includefile($1, 0, 0)/eg;
+      $inc =~ s/#INCLUDE:([^#^\n]+)#/includefile($1, 0, 0)/eg;
     }
   }
   #ok, now do everything else..
@@ -85,9 +85,9 @@ sub subvars {
   $inc =~ s/#TABLEBLANKOKAY:([^:]+):([^:]+):([^#]+)#/tabdb($1,$2,$3,'1')/eg;
   $inc =~ s/#CRYPT:([^:]+):([^:]+):([^#]+)#/crydb($1,$2,$3)/eg;
   $inc =~ s/#COMMAND:([^#]+)#/command($1)/eg;
-  $inc =~ s/#INCLUDE_NOP:([^#]+)#/includefile($1,1,0)/eg;
-  $inc =~ s/#INCLUDE_PKGLIST:([^#]+)#/includefile($1,0,1)/eg;
-  $inc =~ s/#INCLUDE:([^#]+)#/includefile($1, 0, 0)/eg;
+  $inc =~ s/#INCLUDE_NOP:([^#^\n]+)#/includefile($1,1,0)/eg;
+  $inc =~ s/#INCLUDE_PKGLIST:([^#^\n]+)#/includefile($1,0,1)/eg;
+  $inc =~ s/#INCLUDE:([^#^\n]+)#/includefile($1, 0, 0)/eg;
 
 
   if ($tmplerr) {
diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index 3c962c70b..c1bd736ba 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -1148,9 +1148,9 @@ sub get_package_names {
         my $doneincludes=0;
 	while (not $doneincludes) {
 	    $doneincludes=1;
-	    if ($pkgtext =~ /#INCLUDE:[^#]+#/) {
+	    if ($pkgtext =~ /#INCLUDE:[^#^\n]+#/) {
 		$doneincludes=0;
-		$pkgtext =~ s/#INCLUDE:([^#]+)#/include_file($1,$idir)/eg;
+		$pkgtext =~ s/#INCLUDE:([^#^\n]+)#/include_file($1,$idir)/eg;
 	    }
 	}
      
diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage
index 7f69d25d1..a00afec7e 100755
--- a/xCAT-server/share/xcat/netboot/sles/genimage
+++ b/xCAT-server/share/xcat/netboot/sles/genimage
@@ -1243,9 +1243,9 @@ sub get_package_names {
         my $doneincludes=0;
 	while (not $doneincludes) {
 	    $doneincludes=1;
-	    if ($pkgtext =~ /#INCLUDE:[^#]+#/) {
+	    if ($pkgtext =~ /#INCLUDE:[^#^\n]+#/) {
 		$doneincludes=0;
-		$pkgtext =~ s/#INCLUDE:([^#]+)#/include_file($1,$idir)/eg;
+		$pkgtext =~ s/#INCLUDE:([^#^\n]+)#/include_file($1,$idir)/eg;
 	    }
 	}