void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Software update fetcher seems to work, going back to updater/installer itself.

Browse source
This commit is contained in:
Adam Ierymenko 2013-12-11 13:14:10 -08:00
parent a22a3ed7e8
commit ec4ffc0c2c
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
make-linux.mk
View file

@ -5,6 +5,10 @@ INCLUDES=
DEFS= DEFS=
LIBS= LIBS=
ifeq ($(ZT_AUTO_UPDATE),1)
DEFS+=-DZT_AUTO_UPDATE
endif
# Uncomment for a release optimized build # Uncomment for a release optimized build
CFLAGS=-Wall -O3 -fno-unroll-loops -fvisibility=hidden -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS) CFLAGS=-Wall -O3 -fno-unroll-loops -fvisibility=hidden -fstack-protector -pthread $(INCLUDES) -DNDEBUG $(DEFS)
STRIP=strip --strip-all STRIP=strip --strip-all

6
make-mac.mk
View file

@ -2,9 +2,13 @@ CC=clang
CXX=clang++ CXX=clang++
INCLUDES= INCLUDES=
DEFS=-DZT_AUTO_UPDATE DEFS=
LIBS=-lm LIBS=-lm
ifeq ($(ZT_AUTO_UPDATE),1)
DEFS+=-DZT_AUTO_UPDATE
endif
# Uncomment for a release optimized universal binary build # Uncomment for a release optimized universal binary build
CFLAGS=-arch i386 -arch x86_64 -Wall -O4 -pthread -mmacosx-version-min=10.6 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS) CFLAGS=-arch i386 -arch x86_64 -Wall -O4 -pthread -mmacosx-version-min=10.6 -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
STRIP=strip STRIP=strip

2
node/SoftwareUpdater.cpp
View file

@ -176,6 +176,8 @@ void SoftwareUpdater::_cbHandleGetLatestVersionBinary(void *arg,int code,const s
::close(fd); ::close(fd);
::chmod(updatePath.c_str(),0755); ::chmod(updatePath.c_str(),0755);
upd->_status = UPDATE_STATUS_IDLE;
_r->node->terminate(Node::NODE_RESTART_FOR_UPGRADE,updatePath.c_str()); _r->node->terminate(Node::NODE_RESTART_FOR_UPGRADE,updatePath.c_str());
#endif #endif