From f6a003a5aeb29151aa1839cfafd004c7ed0ec838 Mon Sep 17 00:00:00 2001 From: mxi1 Date: Tue, 31 Mar 2009 03:34:39 +0000 Subject: [PATCH] -bug 2716066:timezone is not set in site table; \nupdate "grep ^ZONE" to "grep -E " git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3049 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 6266a7303..c81e04fee 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -168,7 +168,7 @@ if [ "$1" = "1" ]; then #Only if installing for the first 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=`grep -E "^TIMEZONE|^ZONE" /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'