fix the way the xcatdsklspost file is included in the template file

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4266 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2009-09-30 17:27:42 +00:00
parent 4fedb1cc7f
commit befc4743c4
7 changed files with 26 additions and 24 deletions
--- a/perl-xCAT/xCAT/Template.pm
+++ b/perl-xCAT/xCAT/Template.pm
@@ -75,6 +75,8 @@ sub subvars {
  $inc =~ s/#CRYPT:([^:]+):([^:]+):([^#]+)#/crydb($1,$2,$3)/eg;
  $inc =~ s/#COMMAND:([^#]+)#/command($1)/eg;
  $inc =~ s/#INCLUDE_NOP:([^#]+)#/includefile($1,1)/eg;
+  $inc =~ s/#INCLUDE:([^#]+)#/includefile($1, 0)/eg;
+

  if ($tmplerr) {
     close ($outh);
--- a/xCAT-server/share/xcat/install/scripts/post.rh
+++ b/xCAT-server/share/xcat/install/scripts/post.rh
@@ -23,8 +23,8 @@ hostname $HOSTNAME
 #
 # put xCAT post install in init.d process
 #
-cat >/etc/init.d/xcatpostinit << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
+cat >/etc/init.d/xcatpostinit << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
 EOF
 chmod 755 /etc/init.d/xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@@ -32,8 +32,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit

 mkdir -p /opt/xcat
-cat >/opt/xcat/xcatdsklspost << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
+cat >/opt/xcat/xcatdsklspost << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
 chkconfig xcatpostinit off
 EOF
 TMP=`sed "/IBM(c)/ a ADDSITEYUM=1" /opt/xcat/xcatdsklspost`
--- a/xCAT-server/share/xcat/install/scripts/post.rh.iscsi
+++ b/xCAT-server/share/xcat/install/scripts/post.rh.iscsi
@@ -22,8 +22,8 @@ export HOSTNAME=$(host $IP 2>/dev/null | awk '{print $5}' | awk -F. '{print $1}'
 hostname $HOSTNAME#
 # put xCAT post install in init.d process
 #
-cat >/etc/init.d/xcatpostinit << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
+cat >/etc/init.d/xcatpostinit << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
 EOF
 chmod 755 /etc/init.d/xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@@ -31,8 +31,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit

 mkdir -p /opt/xcat
-cat >/opt/xcat/xcatdsklspost << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
+cat >/opt/xcat/xcatdsklspost << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
 chkconfig xcatpostinit off
 EOF
 TMP=`sed "/IBM(c)/ a ADDSITEYUM=1" /opt/xcat/xcatdsklspost`
--- a/xCAT-server/share/xcat/install/scripts/post.sles
+++ b/xCAT-server/share/xcat/install/scripts/post.sles
@@ -52,8 +52,8 @@ echo $HOSTNAME

 /sbin/portmap

-cat >/etc/init.d/xcatpostinit << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
+cat >/etc/init.d/xcatpostinit << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
 EOF
 chmod 755 /etc/init.d/xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@@ -61,8 +61,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit

 mkdir -p /opt/xcat
-cat >/opt/xcat/xcatdsklspost << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
+cat >/opt/xcat/xcatdsklspost << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
 chkconfig xcatpostinit off
 EOF
 chmod 755 /opt/xcat/xcatdsklspost
--- a/xCAT-server/share/xcat/install/scripts/post.sles.iscsi
+++ b/xCAT-server/share/xcat/install/scripts/post.sles.iscsi
@@ -26,8 +26,8 @@ echo $HOSTNAME

 /sbin/portmap

-cat >/etc/init.d/xcatpostinit << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
+cat >/etc/init.d/xcatpostinit << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
 EOF
 chmod 755 /etc/init.d/xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@@ -35,8 +35,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit

 mkdir -p /opt/xcat
-cat >/opt/xcat/xcatdsklspost << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
+cat >/opt/xcat/xcatdsklspost << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
 chkconfig xcatpostinit off
 EOF
 chmod 755 /opt/xcat/xcatdsklspost
--- a/xCAT-server/share/xcat/install/scripts/post.sles11
+++ b/xCAT-server/share/xcat/install/scripts/post.sles11
@@ -52,8 +52,8 @@ echo $HOSTNAME

 /sbin/portmap

-cat >/etc/init.d/xcatpostinit << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
+cat >/etc/init.d/xcatpostinit << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
 EOF
 chmod 755 /etc/init.d/xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@@ -61,8 +61,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit

 mkdir -p /opt/xcat
-cat >/opt/xcat/xcatdsklspost << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
+cat >/opt/xcat/xcatdsklspost << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
 chkconfig xcatpostinit off
 EOF
 chmod 755 /opt/xcat/xcatdsklspost
--- a/xCAT-server/share/xcat/install/scripts/post.sles11.iscsi
+++ b/xCAT-server/share/xcat/install/scripts/post.sles11.iscsi
@@ -35,8 +35,8 @@ echo "$MASTER:/install  /install    nfs timeo=14,intr   1 2" >>/etc/fstab
 # check the arch for nodetype
 NODE_ARCH=#TABLE:nodetype:$NODE:arch#

-cat >/etc/init.d/xcatpostinit << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
+cat >/etc/init.d/xcatpostinit << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
 EOF
 chmod 755 /etc/init.d/xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@@ -44,8 +44,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
 ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit

 mkdir -p /opt/xcat
-cat >/opt/xcat/xcatdsklspost << EOF
-#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
+cat >/opt/xcat/xcatdsklspost << 'EOF'
+#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
 chkconfig xcatpostinit off
 EOF
 chmod 755 /opt/xcat/xcatdsklspost