From d44ba1dbdb4b31ffb99a8d7119f9089a8961b53a Mon Sep 17 00:00:00 2001 From: linggao Date: Mon, 11 May 2009 20:46:03 +0000 Subject: [PATCH] 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 --- perl-xCAT/xCAT/Template.pm | 4 ++++ xCAT-server/share/xcat/install/centos/all.tmpl | 4 ++-- xCAT-server/share/xcat/install/centos/compute.tmpl | 4 ++-- xCAT-server/share/xcat/install/centos/iscsi.tmpl | 4 ++-- xCAT-server/share/xcat/install/centos/xen.tmpl | 4 ++-- .../share/xcat/install/fedora/compute.fedora9.ppc64.tmpl | 4 ++-- xCAT-server/share/xcat/install/fedora/compute.fedora9.tmpl | 4 ++-- xCAT-server/share/xcat/install/fedora/compute.ppc64.tmpl | 4 ++-- xCAT-server/share/xcat/install/fedora/compute.tmpl | 4 ++-- .../share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl | 4 ++-- xCAT-server/share/xcat/install/fedora/iscsi.fedora9.tmpl | 4 ++-- xCAT-server/share/xcat/install/fedora/iscsi.ppc64.tmpl | 4 ++-- xCAT-server/share/xcat/install/fedora/iscsi.tmpl | 4 ++-- .../share/xcat/install/fedora/service.fedora9.ppc64.tmpl | 4 ++-- xCAT-server/share/xcat/install/fedora/service.fedora9.tmpl | 4 ++-- xCAT-server/share/xcat/install/fedora/service.ppc64.tmpl | 4 ++-- xCAT-server/share/xcat/install/fedora/service.tmpl | 4 ++-- xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl | 4 ++-- xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl | 4 ++-- xCAT-server/share/xcat/install/rh/compute.tmpl | 4 ++-- xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl | 4 ++-- xCAT-server/share/xcat/install/rh/iscsi.tmpl | 4 ++-- xCAT-server/share/xcat/install/rh/kvm.tmpl | 4 ++-- xCAT-server/share/xcat/install/rh/service.ppc64.tmpl | 4 ++-- xCAT-server/share/xcat/install/rh/service.tmpl | 4 ++-- xCAT-server/share/xcat/install/rh/xen.tmpl | 4 ++-- xCAT-server/share/xcat/install/sles/compute.ppc64.tmpl | 6 +++--- xCAT-server/share/xcat/install/sles/compute.sles11.tmpl | 6 +++--- xCAT-server/share/xcat/install/sles/compute.tmpl | 6 +++--- xCAT-server/share/xcat/install/sles/iscsi.tmpl | 6 +++--- xCAT-server/share/xcat/install/sles/iscsiibft.sles11.tmpl | 6 +++--- xCAT-server/share/xcat/install/sles/service.sles11.tmpl | 6 +++--- xCAT-server/share/xcat/install/sles/xen.tmpl | 6 +++--- 33 files changed, 75 insertions(+), 71 deletions(-) diff --git a/perl-xCAT/xCAT/Template.pm b/perl-xCAT/xCAT/Template.pm index db6cfeaab..468f7bdd1 100644 --- 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) { diff --git a/xCAT-server/share/xcat/install/centos/all.tmpl b/xCAT-server/share/xcat/install/centos/all.tmpl index 9fab4e402..432315c43 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/centos/compute.tmpl b/xCAT-server/share/xcat/install/centos/compute.tmpl index 83cdf8c80..4691a564b 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/centos/iscsi.tmpl b/xCAT-server/share/xcat/install/centos/iscsi.tmpl index 17d51b255..5946021b3 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/centos/xen.tmpl b/xCAT-server/share/xcat/install/centos/xen.tmpl index 1fe1a99ff..86a9d0d53 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl index 5d2f31625..50fe6cfe6 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/compute.fedora9.tmpl b/xCAT-server/share/xcat/install/fedora/compute.fedora9.tmpl index 555a269cf..cf9916f31 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/compute.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/compute.ppc64.tmpl index daa3a3ad3..15785dcc7 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/compute.tmpl b/xCAT-server/share/xcat/install/fedora/compute.tmpl index 99c12ba87..39b8a541f 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl index 79725d29f..14ae780ad 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.fedora9.tmpl index 05048c3cb..d7767c72e 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/iscsi.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.ppc64.tmpl index b47d60419..31a69a26f 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/iscsi.tmpl b/xCAT-server/share/xcat/install/fedora/iscsi.tmpl index 4cca1cec1..5ba2e2d5c 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/service.fedora9.ppc64.tmpl index ca9b4efd9..07ac6a123 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/service.fedora9.tmpl b/xCAT-server/share/xcat/install/fedora/service.fedora9.tmpl index 5a90c11f0..674705ba8 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/service.ppc64.tmpl b/xCAT-server/share/xcat/install/fedora/service.ppc64.tmpl index 5e0fa778f..e38fed723 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/fedora/service.tmpl b/xCAT-server/share/xcat/install/fedora/service.tmpl index d3d981044..ea59732fc 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/compute.ppc64.tmpl index 7a79be2e2..f3b9a00d1 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhel4.tmpl index 9f89475e9..453ebae55 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/rh/compute.tmpl b/xCAT-server/share/xcat/install/rh/compute.tmpl index bae500a5b..c6b51fc84 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/iscsi.ppc64.tmpl index 4acfbf99c..0e5267b5f 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/rh/iscsi.tmpl b/xCAT-server/share/xcat/install/rh/iscsi.tmpl index 17d51b255..5946021b3 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/rh/kvm.tmpl b/xCAT-server/share/xcat/install/rh/kvm.tmpl index 9e1227e85..9e0b52549 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/service.ppc64.tmpl index ae7b29983..da58ebb98 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/rh/service.tmpl b/xCAT-server/share/xcat/install/rh/service.tmpl index 4c284dccb..2fbb3105c 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/rh/xen.tmpl b/xCAT-server/share/xcat/install/rh/xen.tmpl index 1fe1a99ff..86a9d0d53 100644 --- 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# diff --git a/xCAT-server/share/xcat/install/sles/compute.ppc64.tmpl b/xCAT-server/share/xcat/install/sles/compute.ppc64.tmpl index a4273fb06..bf1a0a838 100644 --- a/xCAT-server/share/xcat/install/sles/compute.ppc64.tmpl +++ b/xCAT-server/share/xcat/install/sles/compute.ppc64.tmpl @@ -79,9 +79,9 @@ - #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# diff --git a/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl index 92b364fc2..897f96db2 100644 --- a/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl +++ b/xCAT-server/share/xcat/install/sles/compute.sles11.tmpl @@ -77,9 +77,9 @@ - #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# diff --git a/xCAT-server/share/xcat/install/sles/compute.tmpl b/xCAT-server/share/xcat/install/sles/compute.tmpl index deae32e38..0f5950bf3 100644 --- a/xCAT-server/share/xcat/install/sles/compute.tmpl +++ b/xCAT-server/share/xcat/install/sles/compute.tmpl @@ -78,9 +78,9 @@ - #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# diff --git a/xCAT-server/share/xcat/install/sles/iscsi.tmpl b/xCAT-server/share/xcat/install/sles/iscsi.tmpl index 0381fe8e9..253d97172 100644 --- a/xCAT-server/share/xcat/install/sles/iscsi.tmpl +++ b/xCAT-server/share/xcat/install/sles/iscsi.tmpl @@ -90,9 +90,9 @@ - #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# diff --git a/xCAT-server/share/xcat/install/sles/iscsiibft.sles11.tmpl b/xCAT-server/share/xcat/install/sles/iscsiibft.sles11.tmpl index 448a2cee3..e69cade8f 100644 --- a/xCAT-server/share/xcat/install/sles/iscsiibft.sles11.tmpl +++ b/xCAT-server/share/xcat/install/sles/iscsiibft.sles11.tmpl @@ -89,9 +89,9 @@ - #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# diff --git a/xCAT-server/share/xcat/install/sles/service.sles11.tmpl b/xCAT-server/share/xcat/install/sles/service.sles11.tmpl index 0428205f9..dc3835b0c 100644 --- a/xCAT-server/share/xcat/install/sles/service.sles11.tmpl +++ b/xCAT-server/share/xcat/install/sles/service.sles11.tmpl @@ -90,9 +90,9 @@ - #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# diff --git a/xCAT-server/share/xcat/install/sles/xen.tmpl b/xCAT-server/share/xcat/install/sles/xen.tmpl index 01599a689..44cd570fa 100644 --- a/xCAT-server/share/xcat/install/sles/xen.tmpl +++ b/xCAT-server/share/xcat/install/sles/xen.tmpl @@ -135,9 +135,9 @@ - #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#