changed install templates to use absolute path for the #INCLUDE# section

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3348 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
2009-05-11 20:46:03 +00:00 · 2009-05-11 20:46:03 +00:00 · d44ba1dbdb
commit d44ba1dbdb
parent 3f606c471a
33 changed files with 75 additions and 71 deletions
--- a/perl-xCAT/xCAT/Template.pm
+++ b/perl-xCAT/xCAT/Template.pm
@ -54,6 +54,10 @@ sub subvars {
      die "Unable to identify master for $node";
  }
  $ENV{XCATMASTER}=$master;
+
+  #replace the env with the right value so that correct include files can be found
+  $inc =~ s/#ENV:([^#]+)#/envvar($1)/eg;
+
  #FIRST, do *all* includes, recursive and all
  my $doneincludes=0;
  while (not $doneincludes) {
--- a/xCAT-server/share/xcat/install/centos/all.tmpl
+++ b/xCAT-server/share/xcat/install/centos/all.tmpl
@ -178,6 +178,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/centos/compute.tmpl
+++ b/xCAT-server/share/xcat/install/centos/compute.tmpl
@ -172,6 +172,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/centos/iscsi.tmpl
+++ b/xCAT-server/share/xcat/install/centos/iscsi.tmpl
@ -175,6 +175,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh.iscsi#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh.iscsi#
--- a/xCAT-server/share/xcat/install/centos/xen.tmpl
+++ b/xCAT-server/share/xcat/install/centos/xen.tmpl
@ -176,6 +176,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl
@ -167,6 +167,6 @@ bzip2
 binutils
 openssh-server
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/fedora/compute.fedora9.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.fedora9.tmpl
@ -165,6 +165,6 @@ bzip2
 binutils
 openssh-server
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/fedora/compute.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.ppc64.tmpl
@ -167,6 +167,6 @@ bzip2
 binutils
 openssh-server
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/fedora/compute.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/compute.tmpl
@ -166,6 +166,6 @@ bzip2
 binutils
 openssh-server
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl
@ -167,6 +167,6 @@ gdb
 binutils
 openssh-server
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh.iscsi#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh.iscsi#
--- a/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.tmpl
@ -166,6 +166,6 @@ gdb
 binutils
 openssh-server
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh.iscsi#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh.iscsi#
--- a/xCAT-server/share/xcat/install/fedora/iscsi.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/iscsi.ppc64.tmpl
@ -168,6 +168,6 @@ gdb
 binutils
 openssh-server
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh.iscsi#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh.iscsi#
--- a/xCAT-server/share/xcat/install/fedora/iscsi.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/iscsi.tmpl
@ -167,6 +167,6 @@ gdb
 binutils
 openssh-server
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh.iscsi#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh.iscsi#
--- a/xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.tmpl
@ -168,6 +168,6 @@ binutils
 openssh-server
 vsftpd
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/fedora/service.fedora9.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/service.fedora9.tmpl
@ -166,6 +166,6 @@ binutils
 openssh-server
 vsftpd
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/fedora/service.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/service.ppc64.tmpl
@ -169,6 +169,6 @@ binutils
 openssh-server
 vsftpd
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/fedora/service.tmpl
+++ b/xCAT-server/share/xcat/install/fedora/service.tmpl
@ -167,6 +167,6 @@ binutils
 openssh-server
 vsftpd
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl
@ -175,6 +175,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl
@ -173,6 +173,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/rh/compute.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.tmpl
@ -174,6 +174,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl
@ -176,6 +176,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh.iscsi#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh.iscsi#
--- a/xCAT-server/share/xcat/install/rh/iscsi.tmpl
+++ b/xCAT-server/share/xcat/install/rh/iscsi.tmpl
@ -175,6 +175,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh.iscsi#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh.iscsi#
--- a/xCAT-server/share/xcat/install/rh/kvm.tmpl
+++ b/xCAT-server/share/xcat/install/rh/kvm.tmpl
@ -153,6 +153,6 @@ openssh-server
 util-linux
 screen
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl
@ -176,6 +176,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/rh/service.tmpl
+++ b/xCAT-server/share/xcat/install/rh/service.tmpl
@ -174,6 +174,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/rh/xen.tmpl
+++ b/xCAT-server/share/xcat/install/rh/xen.tmpl
@ -176,6 +176,6 @@ openssh-server
 util-linux
 compat-libstdc++-33
 %pre
-#INCLUDE:../scripts/pre.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh#
 %post
-#INCLUDE:../scripts/post.rh#
+#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rh#
--- a/xCAT-server/share/xcat/install/sles/compute.ppc64.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.ppc64.tmpl
@ -79,9 +79,9 @@
      </routing>
    </networking>
    <scripts>
-   #INCLUDE:../scripts/pre.sles#
-   #INCLUDE:../scripts/chroot.sles#
-   #INCLUDE:../scripts/post.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sles#
    </scripts>
  </configure>
 </profile>
--- a/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl
@ -77,9 +77,9 @@
      </routing>
    </networking>
    <scripts>
-   #INCLUDE:../scripts/pre.sles#
-   #INCLUDE:../scripts/chroot.sles#
-   #INCLUDE:../scripts/post.sles11#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sles11#
    </scripts>
  </configure>
 </profile>
--- a/xCAT-server/share/xcat/install/sles/compute.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.tmpl
@ -78,9 +78,9 @@
      </routing>
    </networking>
    <scripts>
-   #INCLUDE:../scripts/pre.sles#
-   #INCLUDE:../scripts/chroot.sles#
-   #INCLUDE:../scripts/post.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sles11#
    </scripts>
  </configure>
 </profile>
--- a/xCAT-server/share/xcat/install/sles/iscsi.tmpl
+++ b/xCAT-server/share/xcat/install/sles/iscsi.tmpl
@ -90,9 +90,9 @@
      </routing>
    </networking>
    <scripts>
-   #INCLUDE:../scripts/pre.sles#
-   #INCLUDE:../scripts/chroot.sles.iscsi#
-   #INCLUDE:../scripts/post.sles.iscsi#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles.iscsi#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sles.iscsi#
    </scripts>
  </configure>
 </profile>
--- a/xCAT-server/share/xcat/install/sles/iscsiibft.sles11.tmpl
+++ b/xCAT-server/share/xcat/install/sles/iscsiibft.sles11.tmpl
@ -89,9 +89,9 @@
      </routing>
    </networking>
    <scripts>
-   #INCLUDE:../scripts/pre.sles#
-   #INCLUDE:../scripts/chroot.sles#
-   #INCLUDE:../scripts/post.sles11.iscsi#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sles11.iscsi#
    </scripts>
  </configure>
 </profile>
--- a/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
+++ b/xCAT-server/share/xcat/install/sles/service.sles11.tmpl
@ -90,9 +90,9 @@
      </routing>
    </networking>
    <scripts>
-   #INCLUDE:../scripts/pre.sles#
-   #INCLUDE:../scripts/chroot.sles#
-   #INCLUDE:../scripts/post.sles11#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sles11#
    </scripts>
  </configure>
 </profile>
--- a/xCAT-server/share/xcat/install/sles/xen.tmpl
+++ b/xCAT-server/share/xcat/install/sles/xen.tmpl
@ -135,9 +135,9 @@
      </routing>
    </networking>
    <scripts>
-   #INCLUDE:../scripts/pre.sles#
-   #INCLUDE:../scripts/chroot.sles#
-   #INCLUDE:../scripts/post.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/chroot.sles#
+   #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.sles#
    </scripts>
  </configure>
 </profile>