Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #15031: reset and check commands break server in some cases #223

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions share/commands/agent-reset
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,15 @@ done

# Try to remove everything that can block
# - restore initial promises
[ "$VERBOSE" = true ] && echo "Restoring initial promises..."
if [ "${UUID}" != "root" ]
then
[ "$VERBOSE" = true ] && echo "Restoring initial promises..."
rm -rf /var/rudder/cfengine-community/inputs/*
# - remove ncf
rm -rf /var/rudder/ncf/common/*
rm -rf /var/rudder/ncf/local/*
fi

# - remove ncf
rm -rf /var/rudder/ncf/common/*
rm -rf /var/rudder/ncf/local/*

# - remove state
[ "$VERBOSE" = true ] && echo "Resetting internal agent state..."
rm -rf /var/rudder/cfengine-community/state/*
Expand Down