Skip to content
Snippets Groups Projects
Commit be7c7736 authored by Jan David Mol's avatar Jan David Mol
Browse files

Task #10690: Use a fixed directory for...

Task #10690: Use a fixed directory for $LOFARROOT/etc/parset-additions.d/override, and thus also removing it from the installation
parent 16162145
No related branches found
No related tags found
No related merge requests found
...@@ -19,10 +19,5 @@ file(GLOB _config_parsets ...@@ -19,10 +19,5 @@ file(GLOB _config_parsets
"${CMAKE_CURRENT_BINARY_DIR}/parset-additions.d/default/*.parset") # configured .parset.in "${CMAKE_CURRENT_BINARY_DIR}/parset-additions.d/default/*.parset") # configured .parset.in
install(FILES ${_config_parsets} DESTINATION etc/parset-additions.d/default) 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. # Install script to generate StationStreams.parset for the live test system.
lofar_add_sbin_scripts(parset-additions.d/default/generateStationStreams.sh) lofar_add_sbin_scripts(parset-additions.d/default/generateStationStreams.sh)
...@@ -44,8 +44,9 @@ for HOST in ${HOSTS:-cbm001 cbm002 cbm003 cbm004 cbm005 cbm006 cbm007 cbm008 cbm ...@@ -44,8 +44,9 @@ for HOST in ${HOSTS:-cbm001 cbm002 cbm003 cbm004 cbm005 cbm006 cbm007 cbm008 cbm
cd \"/localhome/lofar/lofar_versions/${RELEASE_NAME}\" && cd \"/localhome/lofar/lofar_versions/${RELEASE_NAME}\" &&
ln -sfT /localhome/lofarsystem/lofar/var var ln -sfT /localhome/lofarsystem/lofar/var var
# Allow lofarsys to tweak configuration # Sym link installed etc/parset-additions.d/override to common location.
chmod g+w -R etc/parset-additions.d/override 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. # Set capabilities so our soft real-time programs can elevate prios.
# #
......
...@@ -19,6 +19,7 @@ error() ...@@ -19,6 +19,7 @@ error()
# Create runtime output directories if not exists. # Create runtime output directories if not exists.
# Not done at build, because it is a post-install setting. Different in production. # 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/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. # Set all locales to "C" to avoid problems with, e.g., perl.
export LC_ALL="C" export LC_ALL="C"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment