[make reset] Also remove fsroot directory (#2489)

This commit is contained in:
Joe LeVeque 2019-01-25 17:02:54 -08:00 committed by lguohan
parent 36a9678d3e
commit d1b72fdd28

View File

@ -166,12 +166,15 @@ init :
reset : reset :
@echo && echo -n "Warning! All local changes will be lost. Proceed? [y/N]: " @echo && echo -n "Warning! All local changes will be lost. Proceed? [y/N]: "
@read ans && \ @read ans && \
if [ $$ans == y ]; then \ if [ $$ans == y ]; then \
git clean -xfdf; \ echo "Resetting local repository. Please wait..."; \
git reset --hard; \ $(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) sudo rm -rf fsroot; \
git submodule foreach --recursive git clean -xfdf; \ git clean -xfdf; \
git submodule foreach --recursive git reset --hard; \ git reset --hard; \
git submodule update --init --recursive;\ git submodule foreach --recursive git clean -xfdf; \
else \ git submodule foreach --recursive git reset --hard; \
echo "Reset aborted"; \ git submodule update --init --recursive; \
fi echo "Reset complete!"; \
else \
echo "Reset aborted"; \
fi