From 8c01f8c93fd4550cda4ea0b494722040c8ac5b71 Mon Sep 17 00:00:00 2001 From: jjhua Date: Wed, 5 Dec 2012 08:25:49 +0000 Subject: [PATCH] some minor changes about the the and syntax git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14556 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/perl/xCAT/Template.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm index 68c7a611e..8fa4db38a 100644 --- a/xCAT-server/lib/perl/xCAT/Template.pm +++ b/xCAT-server/lib/perl/xCAT/Template.pm @@ -935,8 +935,8 @@ sub subvars_for_mypostscript { #ok, now do everything else.. #$inc =~ s/#XCATVAR:([^#]+)#/envvar($1)/eg; #$inc =~ s/#ENV:([^#]+)#/envvar($1)/eg; - $inc =~ s/#NODE#/$node/eg; - $inc =~ s/\$NODE/$node/eg; + #$inc =~ s/#NODE#/$node/eg; + $inc =~ s/#\$NODE#/$node/eg; $inc =~ s/#SITE_TABLE_ALL_ATTRIBS_EXPORT#/$allattribsfromsitetable/eg; #$inc =~ s/#TABLE:([^:]+):([^:]+):([^:]+):BLANKOKAY#/tabdb($1,$2,$3,1)/eg; $inc =~ s/#TABLE:([^:]+):([^:]+):([^#]+)#/tabdb($1,$2,$3)/eg; @@ -949,7 +949,7 @@ sub subvars_for_mypostscript { $inc =~ s/#INCLUDE_POSTBOOTSCRIPTS_LIST#/$postbootscripts/eg; #$inc =~ s/#COMMAND:([^#]+)#/command($1)/eg; - $inc =~ s/#NTYPE#/$nodetype/eg; + $inc =~ s/#\$NTYPE#/$nodetype/eg; $inc =~ s/#Subroutine:([^:]+)::([^:]+)::([^:]+):([^#]+)#/subroutine($1,$2,$3,$4)/eg; #$inc =~ s/^([^#]+)=[\s]*export $1//eg;