diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a22109d43da18bbfc9ad1de849a7c925c0aff60..751e9c07ea503b254ba8a669fb179f125e19dceb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,7 +137,7 @@ if(UNIX) message("[*] Debian package setup pkgarch=${CPACK_DEBIAN_PACKAGE_ARCHITECTURE} version=${CPACK_PACKAGE_VERSION}") SET( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA - "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm;${CMAKE_CURRENT_SOURCE_DIR}/debian/templates;${CMAKE_CURRENT_SOURCE_DIR}/debian/config;") + "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/prerm;${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm;${CMAKE_CURRENT_SOURCE_DIR}/debian/templates;${CMAKE_CURRENT_SOURCE_DIR}/debian/config;") elseif(BSD) message("[*] BSD family system ${CMAKE_SYSTEM} ") elseif(DARWIN) @@ -477,7 +477,7 @@ else() INSTALL(TARGETS ${NODE_TOOL_TARGET} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) if (SUPPORT_PYTHON_PLUGINS AND NOT BUILD_WITH_SYSTEM_PYTHON) #install python environment if not system python in use - INSTALL(DIRECTORY ${PYTHON_PREFIX} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/python USE_SOURCE_PERMISSIONS) + INSTALL(DIRECTORY ${PYTHON_PREFIX} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin USE_SOURCE_PERMISSIONS) endif() endif() diff --git a/dist.linux/share/cellframe-node.service b/dist.linux/share/cellframe-node.service index 51f096d482e216550805b60ab1224d819ffe4401..f127bdc694dda35d25fff87269dc673f6b436923 100644 --- a/dist.linux/share/cellframe-node.service +++ b/dist.linux/share/cellframe-node.service @@ -1,6 +1,6 @@ [Unit] Description=Cellframe Node -After=network.target +After=network-online.target [Service] WorkingDirectory=/opt/cellframe-node @@ -9,7 +9,6 @@ ExecStop=/bin/kill -SIGTERM $MAINPID Restart=always User=cellframe-node Group=cellframe-node -RestartSec=10 [Install] WantedBy=multi-user.target diff --git a/prod_build b/prod_build index bae66a47cee74e0d9663a1b1a34ef1a3db4740b7..3afaba317ce1039427254413bce41026763ecd50 160000 --- a/prod_build +++ b/prod_build @@ -1 +1 @@ -Subproject commit bae66a47cee74e0d9663a1b1a34ef1a3db4740b7 +Subproject commit 3afaba317ce1039427254413bce41026763ecd50