提交 40225f4a 编写于 作者: C Chris Hajas 提交者: Jesse Zhang

Revert "Revert "SED_PG_CONF: fix race condition that corrupted configurations""

This reverts commit 0b55a443.
上级 598f4b0e
......@@ -343,7 +343,6 @@ RETRY () {
SED_PG_CONF () {
LOG_MSG "[INFO]:-Start Function $FUNCNAME"
SED_TMP_FILE=/tmp/sed_text.$$
APPEND=0
FILENAME=$1;shift
SEARCH_TXT=$1;shift
......@@ -407,30 +406,26 @@ SED_PG_CONF () {
fi
else
if [ $KEEP_PREV -eq 0 ];then
$ECHO "s/${SEARCH_TXT}/${SUB_TXT} #${SEARCH_TXT}/" > $SED_TMP_FILE
SED_COMMAND="s/${SEARCH_TXT}/${SUB_TXT} #${SEARCH_TXT}/"
else
$ECHO "s/${SEARCH_TXT}.*/${SUB_TXT}/" > $SED_TMP_FILE
SED_COMMAND="s/${SEARCH_TXT}.*/${SUB_TXT}/"
fi
$CAT $SED_TMP_FILE | $TRUSTED_SHELL ${SED_HOST} $DD of=$SED_TMP_FILE > /dev/null 2>&1
$TRUSTED_SHELL $SED_HOST "sed -i'.bak1' -f $SED_TMP_FILE $FILENAME" > /dev/null 2>&1
$TRUSTED_SHELL $SED_HOST sed -i'.bak1' -f /dev/stdin "$FILENAME" <<< "$SED_COMMAND" > /dev/null 2>&1
if [ $RETVAL -ne 0 ]; then
ERROR_EXIT "[FATAL]:-Failed to insert $SUB_TXT in $FILENAME on $SED_HOST" 2
else
LOG_MSG "[INFO]:-Replaced line in $FILENAME on $SED_HOST"
$TRUSTED_SHELL $SED_HOST "$RM -f ${FILENAME}.bak1" > /dev/null 2>&1
fi
$ECHO "s/^#${SEARCH_TXT}/${SEARCH_TXT}/" > $SED_TMP_FILE
$CAT $SED_TMP_FILE | $TRUSTED_SHELL ${SED_HOST} $DD of=$SED_TMP_FILE > /dev/null 2>&1
$TRUSTED_SHELL $SED_HOST "sed -i'.bak2' -f $SED_TMP_FILE $FILENAME" > /dev/null 2>&1
SED_COMMAND="s/^#${SEARCH_TXT}/${SEARCH_TXT}/"
$TRUSTED_SHELL $SED_HOST sed -i'.bak2' -f /dev/stdin "$FILENAME" <<< "$SED_COMMAND" > /dev/null 2>&1
if [ $RETVAL -ne 0 ]; then
ERROR_EXIT "[FATAL]:-Failed to substitute #${SEARCH_TXT} in $FILENAME on $SED_HOST" 2
else
LOG_MSG "[INFO]:-Replaced line in $FILENAME on $SED_HOST"
$TRUSTED_SHELL $SED_HOST "$RM -f ${FILENAME}.bak2" > /dev/null 2>&1
fi
$TRUSTED_SHELL $SED_HOST "$RM -f $SED_TMP_FILE"
$RM -f $SED_TMP_FILE
fi
trap - ERR DEBUG # Disable trap
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册