diff --git a/RTCP/Cobalt/GPUProc/etc/CMakeLists.txt b/RTCP/Cobalt/GPUProc/etc/CMakeLists.txt index 4cf50c3131641a5c8d65263ac95d6ee71049b303..31b922f38d32fe054b5d8f9066c1090ac31bf47d 100644 --- a/RTCP/Cobalt/GPUProc/etc/CMakeLists.txt +++ b/RTCP/Cobalt/GPUProc/etc/CMakeLists.txt @@ -19,10 +19,5 @@ file(GLOB _config_parsets "${CMAKE_CURRENT_BINARY_DIR}/parset-additions.d/default/*.parset") # configured .parset.in install(FILES ${_config_parsets} DESTINATION etc/parset-additions.d/default) -# List of override/ config parsets: -# We have none. Create directory to allow post-install override/ parsets. -INSTALL(CODE "FILE(MAKE_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/etc/parset-additions.d/override\")") - - # Install script to generate StationStreams.parset for the live test system. lofar_add_sbin_scripts(parset-additions.d/default/generateStationStreams.sh) diff --git a/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh b/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh index e23c45a1b0f6657138fd17d1e29bc7beaeffa89b..d8101d2cf4c4999346704268618eb3d0c59179f2 100755 --- a/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh +++ b/RTCP/Cobalt/GPUProc/src/scripts/Cobalt_install.sh @@ -44,8 +44,9 @@ for HOST in ${HOSTS:-cbm001 cbm002 cbm003 cbm004 cbm005 cbm006 cbm007 cbm008 cbm cd \"/localhome/lofar/lofar_versions/${RELEASE_NAME}\" && ln -sfT /localhome/lofarsystem/lofar/var var - # Allow lofarsys to tweak configuration - chmod g+w -R etc/parset-additions.d/override + # Sym link installed etc/parset-additions.d/override to common location. + cd \"/localhome/lofar/lofar_versions/${RELEASE_NAME}\" && + ln -sfT /localhome/lofarsystem/lofar/parset-overrides etc/parset-additions.d/override # Set capabilities so our soft real-time programs can elevate prios. # diff --git a/SubSystems/Online_Cobalt/test/testFuncs.sh.in b/SubSystems/Online_Cobalt/test/testFuncs.sh.in index 51e146d427b31edcbfa49d1042334e3c5b09872f..7672a655827b8d11116dfa37367768ff8e9d1f13 100755 --- a/SubSystems/Online_Cobalt/test/testFuncs.sh.in +++ b/SubSystems/Online_Cobalt/test/testFuncs.sh.in @@ -19,6 +19,7 @@ error() # Create runtime output directories if not exists. # Not done at build, because it is a post-install setting. Different in production. mkdir -p "$LOFARROOT/var/log" "$LOFARROOT/var/run" || error "Failed to create runtime output directories" +mkdir -p "$LOFARROOT/etc/parset-additions.d/override" || error "Failed to create runtime input directories" # Set all locales to "C" to avoid problems with, e.g., perl. export LC_ALL="C"