From d2066779b0d75b6b4c3198fa3edcf066c4a220ec Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 7 Jul 2008 18:29:42 +0000
Subject: [PATCH] -Have xCAT accept SLES /etc/sysconfig/clock formatting for a
 hint on timezone

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1840 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/xCAT.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 6620c5c3d..8a3e8fb56 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -142,7 +142,7 @@ if [ "$1" = "1" ]; then #Only if installing for the fist time..
       XCATROOT=$RPM_INSTALL_PREFIX0 $RPM_INSTALL_PREFIX0/sbin/chtab key=master site.value=$(getent hosts `hostname`|awk '{print $1}')
       XCATROOT=$RPM_INSTALL_PREFIX0 $RPM_INSTALL_PREFIX0/sbin/chtab key=domain site.value=$(hostname -d)
       XCATROOT=$RPM_INSTALL_PREFIX0 $RPM_INSTALL_PREFIX0/sbin/chtab key=installdir site.value=/install
-      XCATROOT=$RPM_INSTALL_PREFIX0 $RPM_INSTALL_PREFIX0/sbin/chtab key=timezone site.value=`grep ^ZONE /etc/sysconfig/clock|cut -d= -f 2|sed -e 's/"//g'`
+      XCATROOT=$RPM_INSTALL_PREFIX0 $RPM_INSTALL_PREFIX0/sbin/chtab key=timezone site.value=`egrep '^(ZONE|TIMEZONE)' /etc/sysconfig/clock|cut -d= -f 2|sed -e 's/"//g'`
     fi
     if [ ! -r /etc/xcat/postscripts.sqlite ]; then
       XCATROOT=$RPM_INSTALL_PREFIX0 $RPM_INSTALL_PREFIX0/sbin/chtab node=xcatdefaults postscripts.postscripts='syslog,remoteshell'