xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-03 10:07:36 +00:00
Code Issues Releases Wiki Activity

Merge pull request #344 from immarvin/onissue97

Browse Source 
fix issue #97 [fvt]2.11:still could not get l full debuginfo in management node for diskless provision after xcatdebugmode=1
This commit is contained in:
Xiaopeng Wang
2015-11-05 13:28:06 +08:00
parent 8ff0f796c1 11b3c7d2ec
commit e2150f039d
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/share/xcat/install/scripts/post.ubuntu
View File

@@ -96,7 +96,7 @@ do
msgutil_r "$MASTER_IP" "debug" "trying to get mypostscript with getpostscript.awk" "/var/log/xcat/xcat.log"
fi
/xcatpost/getpostscript.awk |sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' | sed -e 's/&lt;/</g' -e 's/&gt;/>/g' -e 's/&amp;/\&/g' -e 's/&quot;/"/g' -e "s/&apos;/'/g" > /xcatpost/mypostscript
MYCONT=`grep MASTER /xcatpost/mypostscript`
MYCONT=`grep ^MASTER= /xcatpost/mypostscript`
MAX_RETRIES=10
RETRY=0
while [ -z "$MYCONT" ]; do
@@ -109,7 +109,7 @@ do
let SLI=$RANDOM%10+10
sleep $SLI
/xcatpost/getpostscript.awk |sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' | sed -e 's/&lt;/</g' -e 's/&gt;/>/g' -e 's/&amp;/\&/g' -e 's/&quot;/"/g' -e "s/&apos;/'/g" > /xcatpost/mypostscript
MYCONT=`grep MASTER /xcatpost/mypostscript`
MYCONT=`grep ^MASTER= /xcatpost/mypostscript`
done
@@ -162,10 +162,10 @@ run_ps () {
local compt=\$(file \$1)
local reg=\"shell script\"
if [[ \"\$compt\" =~ \$reg ]]; then
bash -x ./\$@ 2>&1 | tee -a \$logfile
bash -x ./\$@ 2>&1 | tee -a \$logfile | logger -t xcat -p debug
ret_local=\${PIPESTATUS[0]}
else
./\$@ 2>&1 | tee -a \$logfile
./\$@ 2>&1 | tee -a \$logfile | logger -t xcat -p debug
ret_local=\${PIPESTATUS[0]}
fi
else

8
xCAT-server/share/xcat/install/scripts/post.xcat
View File

@@ -77,7 +77,7 @@ do
/xcatpost/getpostscript.awk |sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' | sed -e 's/&lt;/</g' -e 's/&gt;/>/g' -e 's/&amp;/\&/g' -e 's/&quot;/"/g' -e "s/&apos;/'/g" > /xcatpost/mypostscript
MYCONT=`grep MASTER /xcatpost/mypostscript`
MYCONT=`grep ^MASTER= /xcatpost/mypostscript`
MAX_RETRIES=10
RETRY=0
while [ -z "$MYCONT" ]; do
@@ -91,7 +91,7 @@ do
sleep $SLI
/xcatpost/getpostscript.awk |sed -e 's/<[^>]*>//g'|egrep -v '^ *$'|sed -e 's/^ *//' | sed -e 's/&lt;/</g' -e 's/&gt;/>/g' -e 's/&amp;/\&/g' -e 's/&quot;/"/g' -e "s/&apos;/'/g" > /xcatpost/mypostscript
MYCONT=`grep MASTER /xcatpost/mypostscript`
MYCONT=`grep ^MASTER= /xcatpost/mypostscript`
done
fi
@@ -147,10 +147,10 @@ run_ps () {
local compt=\$(file \$1)
local reg=\"shell script\"
if [[ \"\$compt\" =~ \$reg ]]; then
bash -x ./\$@ 2>&1 | tee -a \$logfile
bash -x ./\$@ 2>&1 | tee -a \$logfile | logger -t xcat -p debug
ret_local=\${PIPESTATUS[0]}
else
./\$@ 2>&1 | tee -a \$logfile
./\$@ 2>&1 | tee -a \$logfile | logger -t xcat -p debug
ret_local=\${PIPESTATUS[0]}
fi
else

4
xCAT/postscripts/xcatdsklspost
View File

@@ -832,10 +832,10 @@ run_ps () {
local compt=\$(file \$1)
local reg=\"shell script\"
if [[ \"\$compt\" =~ \$reg ]]; then
bash -x ./\$@ 2>&1 | tee -a \$logfile
bash -x ./\$@ 2>&1 | tee -a \$logfile | logger -t xcat -p debug
ret_local=\${PIPESTATUS[0]}
else
./\$@ 2>&1 | tee -a \$logfile
./\$@ 2>&1 | tee -a \$logfile | logger -t xcat -p debug
ret_local=\${PIPESTATUS[0]}
fi
else