From f458bcba2e572f2a83b7ef987f4f416a126d97ba Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 21 May 2008 20:07:56 +0000 Subject: [PATCH] -Fix problem where Los Angelas would break installs as a timezone -Fix various issues with centos 'all' template git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1471 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server-2.0/share/xcat/install/centos/all.tmpl | 13 +++++++------ .../share/xcat/install/centos/compute.tmpl | 2 +- .../share/xcat/install/centos/iscsi.tmpl | 2 +- .../xcat/install/fedora/compute.fedora9.ppc64.tmpl | 2 +- .../share/xcat/install/fedora/compute.fedora9.tmpl | 2 +- .../share/xcat/install/fedora/compute.ppc64.tmpl | 2 +- .../share/xcat/install/fedora/compute.tmpl | 2 +- .../xcat/install/fedora/iscsi.fedora9.ppc64.tmpl | 2 +- .../share/xcat/install/fedora/iscsi.ppc64.tmpl | 2 +- .../share/xcat/install/fedora/iscsi.tmpl | 2 +- .../xcat/install/fedora/service.fedora9.ppc64.tmpl | 2 +- .../share/xcat/install/fedora/service.fedora9.tmpl | 2 +- .../share/xcat/install/fedora/service.ppc64.tmpl | 2 +- .../share/xcat/install/fedora/service.tmpl | 2 +- .../share/xcat/install/rh/compute.ppc64.tmpl | 2 +- .../share/xcat/install/rh/compute.rhel4.tmpl | 2 +- xCAT-server-2.0/share/xcat/install/rh/compute.tmpl | 2 +- .../share/xcat/install/rh/iscsi.ppc64.tmpl | 2 +- xCAT-server-2.0/share/xcat/install/rh/iscsi.tmpl | 2 +- xCAT-server-2.0/share/xcat/install/rh/service.tmpl | 2 +- 20 files changed, 26 insertions(+), 25 deletions(-) diff --git a/xCAT-server-2.0/share/xcat/install/centos/all.tmpl b/xCAT-server-2.0/share/xcat/install/centos/all.tmpl index 07201981a..8a72ff81a 100644 --- a/xCAT-server-2.0/share/xcat/install/centos/all.tmpl +++ b/xCAT-server-2.0/share/xcat/install/centos/all.tmpl @@ -9,10 +9,11 @@ network --bootproto dhcp # Where's the source? # nfs --server hostname.of.server or IP --dir /path/to/RH/CD/image # -nfs --server #XCATVAR:INSTALL_NFS# --dir #XCATVAR:INSTALL_SRC_DIR# +#nfs --server #XCATVAR:INSTALL_NFS# --dir #XCATVAR:INSTALL_SRC_DIR# +url --url http://#TABLE:noderes:$NODE:nfsserver#/install/#TABLE:nodetype:$NODE:os#/#TABLE:nodetype:$NODE:arch# #device ethernet e100 -keyboard "#TABLE:site.tab:keyboard:1#" +keyboard "us" # # Clear the MBR @@ -103,7 +104,7 @@ mouse none #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site.tab:timezone:1# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X @@ -126,7 +127,7 @@ key --skip #rootpw --iscrypted XaLGAVe1C41x2 #rootpw XaLGAVe1C41x2 --iscrypted #rootpw #TABLE:passwd.tab:rootpw:1# -rootpw --iscrypted #COMMAND:perl -e 'print crypt("#TABLE:passwd.tab:rootpw:1#","Xa") . "\n";'p# +rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password# # # NIS setup: auth --enablenis --nisdomain sensenet @@ -178,6 +179,6 @@ openssh-server util-linux compat-libstdc++-33 %pre -#COMMAND:genscript pre #ENV:OSVER# #ENV:ARCH## +#INCLUDE:../scripts/pre.rh# %post -#COMMAND:genscript post #ENV:OSVER# #ENV:ARCH## +#INCLUDE:../scripts/post.rh# diff --git a/xCAT-server-2.0/share/xcat/install/centos/compute.tmpl b/xCAT-server-2.0/share/xcat/install/centos/compute.tmpl index 47606c85d..83cdf8c80 100644 --- a/xCAT-server-2.0/share/xcat/install/centos/compute.tmpl +++ b/xCAT-server-2.0/share/xcat/install/centos/compute.tmpl @@ -104,7 +104,7 @@ mouse none #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/centos/iscsi.tmpl b/xCAT-server-2.0/share/xcat/install/centos/iscsi.tmpl index ef3c278f5..ca761ff22 100644 --- a/xCAT-server-2.0/share/xcat/install/centos/iscsi.tmpl +++ b/xCAT-server-2.0/share/xcat/install/centos/iscsi.tmpl @@ -107,7 +107,7 @@ mouse none #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl index c8abe8bf7..5d2f31625 100644 --- a/xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl +++ b/xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.ppc64.tmpl @@ -106,7 +106,7 @@ firewall --disabled #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.tmpl index a73a17f01..555a269cf 100644 --- a/xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.tmpl +++ b/xCAT-server-2.0/share/xcat/install/fedora/compute.fedora9.tmpl @@ -105,7 +105,7 @@ firewall --disabled #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/fedora/compute.ppc64.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/compute.ppc64.tmpl index 30a57746a..82ddac7fb 100644 --- a/xCAT-server-2.0/share/xcat/install/fedora/compute.ppc64.tmpl +++ b/xCAT-server-2.0/share/xcat/install/fedora/compute.ppc64.tmpl @@ -106,7 +106,7 @@ firewall --disabled #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/fedora/compute.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/compute.tmpl index 5221769aa..99c12ba87 100644 --- a/xCAT-server-2.0/share/xcat/install/fedora/compute.tmpl +++ b/xCAT-server-2.0/share/xcat/install/fedora/compute.tmpl @@ -105,7 +105,7 @@ firewall --disabled #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl index b94677af4..7d1a12d6d 100644 --- a/xCAT-server-2.0/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl +++ b/xCAT-server-2.0/share/xcat/install/fedora/iscsi.fedora9.ppc64.tmpl @@ -108,7 +108,7 @@ firewall --disabled #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/fedora/iscsi.ppc64.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/iscsi.ppc64.tmpl index 46f1c8738..0d595cbac 100644 --- a/xCAT-server-2.0/share/xcat/install/fedora/iscsi.ppc64.tmpl +++ b/xCAT-server-2.0/share/xcat/install/fedora/iscsi.ppc64.tmpl @@ -108,7 +108,7 @@ firewall --disabled #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/fedora/iscsi.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/iscsi.tmpl index bbeb322f5..63b8745c5 100644 --- a/xCAT-server-2.0/share/xcat/install/fedora/iscsi.tmpl +++ b/xCAT-server-2.0/share/xcat/install/fedora/iscsi.tmpl @@ -107,7 +107,7 @@ firewall --disabled #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.ppc64.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.ppc64.tmpl index 89265842c..ca9b4efd9 100644 --- a/xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.ppc64.tmpl +++ b/xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.ppc64.tmpl @@ -107,7 +107,7 @@ firewall --disabled #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.tmpl index da1135e06..5a90c11f0 100644 --- a/xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.tmpl +++ b/xCAT-server-2.0/share/xcat/install/fedora/service.fedora9.tmpl @@ -105,7 +105,7 @@ firewall --disabled #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/fedora/service.ppc64.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/service.ppc64.tmpl index 891af66e7..5e0fa778f 100644 --- a/xCAT-server-2.0/share/xcat/install/fedora/service.ppc64.tmpl +++ b/xCAT-server-2.0/share/xcat/install/fedora/service.ppc64.tmpl @@ -107,7 +107,7 @@ firewall --disabled #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/fedora/service.tmpl b/xCAT-server-2.0/share/xcat/install/fedora/service.tmpl index 6685dde91..d3d981044 100644 --- a/xCAT-server-2.0/share/xcat/install/fedora/service.tmpl +++ b/xCAT-server-2.0/share/xcat/install/fedora/service.tmpl @@ -105,7 +105,7 @@ firewall --disabled #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/rh/compute.ppc64.tmpl b/xCAT-server-2.0/share/xcat/install/rh/compute.ppc64.tmpl index b76044685..5315e125e 100644 --- a/xCAT-server-2.0/share/xcat/install/rh/compute.ppc64.tmpl +++ b/xCAT-server-2.0/share/xcat/install/rh/compute.ppc64.tmpl @@ -106,7 +106,7 @@ mouse none #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/rh/compute.rhel4.tmpl b/xCAT-server-2.0/share/xcat/install/rh/compute.rhel4.tmpl index 1fbadbdd1..9f89475e9 100644 --- a/xCAT-server-2.0/share/xcat/install/rh/compute.rhel4.tmpl +++ b/xCAT-server-2.0/share/xcat/install/rh/compute.rhel4.tmpl @@ -104,7 +104,7 @@ mouse none #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/rh/compute.tmpl b/xCAT-server-2.0/share/xcat/install/rh/compute.tmpl index 42332d47f..bae500a5b 100644 --- a/xCAT-server-2.0/share/xcat/install/rh/compute.tmpl +++ b/xCAT-server-2.0/share/xcat/install/rh/compute.tmpl @@ -105,7 +105,7 @@ mouse none #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/rh/iscsi.ppc64.tmpl b/xCAT-server-2.0/share/xcat/install/rh/iscsi.ppc64.tmpl index 7fdad15a6..a9936e09d 100644 --- a/xCAT-server-2.0/share/xcat/install/rh/iscsi.ppc64.tmpl +++ b/xCAT-server-2.0/share/xcat/install/rh/iscsi.ppc64.tmpl @@ -108,7 +108,7 @@ mouse none #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/rh/iscsi.tmpl b/xCAT-server-2.0/share/xcat/install/rh/iscsi.tmpl index ef3c278f5..ca761ff22 100644 --- a/xCAT-server-2.0/share/xcat/install/rh/iscsi.tmpl +++ b/xCAT-server-2.0/share/xcat/install/rh/iscsi.tmpl @@ -107,7 +107,7 @@ mouse none #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X diff --git a/xCAT-server-2.0/share/xcat/install/rh/service.tmpl b/xCAT-server-2.0/share/xcat/install/rh/service.tmpl index 0dbe65d2f..4c284dccb 100644 --- a/xCAT-server-2.0/share/xcat/install/rh/service.tmpl +++ b/xCAT-server-2.0/share/xcat/install/rh/service.tmpl @@ -105,7 +105,7 @@ mouse none #timezone US/Mountain #timezone US/Central #timezone US/Eastern -timezone --utc #TABLE:site:key=timezone:value# +timezone --utc "#TABLE:site:key=timezone:value#" # # Don't do X