Skip to content

Commit

Permalink
Merge pull request #897 from peckpeck/bug_8018/rudder_init_stop_at_th…
Browse files Browse the repository at this point in the history
…e_first_it_encouters

Fixes #8018: rudder-init stop at the first \"&& >\" it encouters
  • Loading branch information
fanf committed Mar 1, 2016
2 parents 560a36f + 6a949e3 commit 6606bb2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions rudder-webapp/SOURCES/rudder-init
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,10 @@ LDAPInit()
sed -i "s/^\([^#].*\)%%POLICY_SERVER_HOSTNAME%%/\1${RUDDER_HOSTNAME}/g" $INITPOLICY_PATH
sed -i "s#^\([^#].*\)%%POLICY_SERVER_ALLOWED_NETWORKS%%#\1$NET#g" $INITPOLICY_PATH

${LDAPADD} -f $BOOTSTRAP_PATH & >> $TMP_LOG
${LDAPADD} -f $BOOTSTRAP_PATH >> $TMP_LOG 2>&1
ErrorCheck

${LDAPADD} -f $INITPOLICY_PATH & >> $TMP_LOG
${LDAPADD} -f $INITPOLICY_PATH >> $TMP_LOG 2>&1
ErrorCheck
}

Expand Down Expand Up @@ -363,9 +363,9 @@ echo -n "Restarting services..."

## Manually launch cf-agent to set up policy server
# Running failsafe will create required directories (such as /var/rudder/ncf/local) and populate tools
cf-agent -f failsafe.cf & >> "$TMP_LOG"
cf-agent -f failsafe.cf >> "$TMP_LOG" 2>&1
# Run all server-specific bundles (except propagatePromises, because they're aren't any yet)
cf-agent -b propagatePromises,install_rsyslogd,root_component_check & >> "$TMP_LOG"
cf-agent -b propagatePromises,install_rsyslogd,root_component_check >> "$TMP_LOG" 2>&1

# The previous run will create /var/rudder/configuration-repository/ncf/ncf.conf but it still needs copying to /var/rudder/ncf/local/ncf.conf
if [ -f /var/rudder/configuration-repository/ncf/ncf.conf ]; then
Expand Down

0 comments on commit 6606bb2

Please sign in to comment.