diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm
index 5f650e0e1..15f98393c 100644
--- a/xCAT-server/lib/perl/xCAT/Template.pm
+++ b/xCAT-server/lib/perl/xCAT/Template.pm
@@ -218,7 +218,12 @@ sub subvars {
         }
         else{
             $partcontent =~ s/\s$//;
-            $inc =~ s/#XCAT_PARTITION_START#[\s\S]*#XCAT_PARTITION_END#/$partcontent/;
+            if ($inc =~ /#XCAT_PARTITION_START#/){
+                $inc =~ s/#XCAT_PARTITION_START#[\s\S]*#XCAT_PARTITION_END#/$partcontent/;
+            }
+            elsif ($inc =~ /<!-- XCAT-PARTITION-START -->/){
+                $inc =~ s/<!-- XCAT-PARTITION-START -->[\s\S]*<!-- XCAT-PARTITION-END -->/$partcontent/;
+            }
         }
     }
   }