From 00170054ff1897cb8ccd5a9b2ef1a4d36701a62f Mon Sep 17 00:00:00 2001
From: ligc <liguangc@cn.ibm.com>
Date: Thu, 8 Jan 2015 16:21:44 +0800
Subject: [PATCH 1/2] rsyslog configuration on Ubuntu, the file ownership of
 /var/log/messages should be syslog:adm

---
 xCAT/postscripts/syslog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/xCAT/postscripts/syslog b/xCAT/postscripts/syslog
index a588b82d3..7bf9c068f 100755
--- a/xCAT/postscripts/syslog
+++ b/xCAT/postscripts/syslog
@@ -105,6 +105,9 @@ config_Rsyslog_C3()
       cat /tmp/sed.tmp >$2 
       echo "*.debug  /var/log/messages" >> $2
       touch  /var/log/messages  
+      if ( pmatch $OSVER "ubuntu*" ) || ( is_lsb_ubuntu ) || ( pmatch $OSVER "debian*" ); then
+        chown syslog:adm /var/log/messages
+      fi
   else
       sed 's/^\(\*\..*\)/\#\1/' $2 >/tmp/sed.tmp
       cat /tmp/sed.tmp >$2
@@ -149,6 +152,9 @@ config_rsyslog_V8()
     #logging is local, do not forward
     #making sure all the messages goes to /var/log/messages
     touch  /var/log/messages
+    if ( pmatch $OSVER "ubuntu*" ) || ( is_lsb_ubuntu ) || ( pmatch $OSVER "debian*" ); then
+      chown syslog:adm /var/log/messages
+    fi
     # backup rsyslog.conf
     if [ ! -f $conf_file.XCATORIG ]; then
       cp -f $conf_file $conf_file.XCATORIG
@@ -318,6 +324,9 @@ else
   if [ $goLocal -eq 1 ]; then
     #making sure all the messages goes to /var/log/messages
     touch  /var/log/messages 
+    if ( pmatch $OSVER "ubuntu*" ) || ( is_lsb_ubuntu ) || ( pmatch $OSVER "debian*" ); then
+      chown syslog:adm /var/log/messages
+    fi
     if [ $ng -eq 0 ]; then
       if [ ! -f $conf_file.XCATORIG ]; then
         cp -f $conf_file $conf_file.XCATORIG

From 4672321fe36323c22f733194d92366f4c9f515ff Mon Sep 17 00:00:00 2001
From: daniceexi <wxp@cn.ibm.com>
Date: Thu, 8 Jan 2015 06:26:12 -0500
Subject: [PATCH 2/2] update the manpage for renergy command that don't set
 power saving for P8 server which is running in OPAL mode

---
 xCAT-client/pods/man1/renergy.1.pod | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xCAT-client/pods/man1/renergy.1.pod b/xCAT-client/pods/man1/renergy.1.pod
index c036e9148..d6212dec5 100644
--- a/xCAT-client/pods/man1/renergy.1.pod
+++ b/xCAT-client/pods/man1/renergy.1.pod
@@ -56,6 +56,10 @@ B<renergy> I<noderange> [-V] { savingstatus={on | off}
 | dsavingstatus={on-norm | on-maxp | off}
 | fsavingstatus={on | off} | ffovalue=MHZ }
 
+I<NOTE:> The setting operation for B<Power 8> server is only supported 
+for the server which is running in PowerVM mode. Do NOT run the setting 
+for the server which is running in OPAL mode.
+
 =back
 
 B<BladeCenter specific :>