From cd3110086c582df3b52cb3554531e40bad988b70 Mon Sep 17 00:00:00 2001
From: ligc <ligc@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 23 Mar 2012 08:30:50 +0000
Subject: [PATCH] fix for bug 3487614: Full installation, extract the common
 code for generating the mypostscript file and make it common across all
 scripts

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

diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 79368d157..e89a807d7 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -147,6 +147,13 @@ sub subvars {
       $inc =~ s/#INCLUDE:([^#^\n]+)#/includefile($1, 0, 0)/eg;
     }
   }
+
+  #Support hierarchical include
+  $inc =~ s/#ENV:([^#]+)#/envvar($1)/eg;
+  if ($inc =~ /#INCLUDE:[^#^\n]+#/) {
+     $inc =~ s/#INCLUDE:([^#^\n]+)#/includefile($1, 0, 0)/eg;
+  }
+
   #ok, now do everything else..
   $inc =~ s/#XCATVAR:([^#]+)#/envvar($1)/eg;
   $inc =~ s/#ENV:([^#]+)#/envvar($1)/eg;