From e2b3183cfb0f62402be6f11fc4f72f4b8e1b8e82 Mon Sep 17 00:00:00 2001 From: penguhyang Date: Tue, 24 May 2016 05:52:06 -0400 Subject: [PATCH 1/2] fix #954, ubuntu, diskfull, enable the pre-script log and post-script-log can be forwarded to the MN --- xCAT-server/share/xcat/install/scripts/pre.ubuntu | 5 +++++ .../share/xcat/install/scripts/pre.ubuntu.ppc64 | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/xCAT-server/share/xcat/install/scripts/pre.ubuntu b/xCAT-server/share/xcat/install/scripts/pre.ubuntu index edbf17beb..3ca5e4515 100644 --- a/xCAT-server/share/xcat/install/scripts/pre.ubuntu +++ b/xCAT-server/share/xcat/install/scripts/pre.ubuntu @@ -5,6 +5,11 @@ fi #!/bin/sh +if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then + killall syslogd + syslogd -R #XCATVAR:XCATMASTER# +fi + if [ ! -c /dev/vcs ]; then mknod /dev/vcs c 7 0 fi diff --git a/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64 b/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64 index 81d44053a..7fe22bf84 100644 --- a/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64 +++ b/xCAT-server/share/xcat/install/scripts/pre.ubuntu.ppc64 @@ -1,5 +1,15 @@ +export XCATDEBUGMODE="#TABLEBLANKOKAY:site:key=xcatdebugmode:value#" +if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then + set -x +fi + #!/bin/sh +if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then + killall syslogd + syslogd -R #XCATVAR:XCATMASTER# +fi + if [ ! -c /dev/vcs ]; then mknod /dev/vcs c 7 0 fi @@ -222,3 +232,7 @@ echo " ." >> /tmp/partitionfile exit 0 +if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then +then + set +x +fi From 183440cd6727d1503678ce956a532c793ade30b8 Mon Sep 17 00:00:00 2001 From: penguhyang Date: Wed, 15 Jun 2016 04:29:37 -0400 Subject: [PATCH 2/2] update Log Collecting content for xcat docs --- docs/source/troubleshooting/os_installation/log_to_mn_cn.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst b/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst index 8b19712b3..cc39421f7 100644 --- a/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst +++ b/docs/source/troubleshooting/os_installation/log_to_mn_cn.rst @@ -22,7 +22,7 @@ The following behavior is observed during OS install: + log +----+----+----+----+----+----+----+----+----+----+ | | CN | Y1 | Y2 | Y2 | +-------------+----+----+----+----+----+----+----+----+----+----+ -| Installer | MN | N | N | N | Y6 | Y6 | N | Y6 | Y6 | N | +| Installer | MN | N | N | N | Y6 | Y6 | Y6 | Y6 | Y6 | Y6 | + log +----+----+----+----+----+----+----+----+----+----+ | | CN | Y5 | Y5 | Y5 | Y5 | Y5 | Y5 | Y5 | Y5 | Y5 | +-------------+----+----+----+----+----+----+----+----+----+----+