diff options
| -rw-r--r-- | irmd.conf.in | 13 | ||||
| -rw-r--r-- | src/irmd/CMakeLists.txt | 9 |
2 files changed, 11 insertions, 11 deletions
diff --git a/irmd.conf.in b/irmd.conf.in index cdfd0309..da5a3288 100644 --- a/irmd.conf.in +++ b/irmd.conf.in @@ -1,21 +1,16 @@ ### Example Ouroboros configuration file # # This file contains a summary of current machine configuration options -# for the O7s prototype. The IRMd systemd service will by default -# attempt to load its configuration file during startup from the file -# @OUROBOROS_CONFIG_DIR@/@OUROBOROS_CONFIG_FILE@. -# If not found, it will error out. +# for the O7s prototype. # -# At the top level, it accepts configuration of -# services via the "name" directive, and configuration of the network -# specifying different IPCPs in the system. So, the list of accepted -# top level stanza is: +# The list of accepted top level stanza is: # # [name.<name of service>] add a new name to the system. # [local.<name for IPCP>] add a new local IPCP to the system. # [eth-llc.<name for IPCP>] add a new IPCP over Ethernet (LLC) to the system. # [eth-dix.<name for IPCP>] add a new IPCP over Ethernet (DIX) to the system. -# [eth-udp.<name for IPCP>] add a new IPCP over UDP/IPv4 to the system. +# [udp4.<name for IPCP>] add a new IPCP over UDP/IPv4 to the system. +# [udp6.<name for IPCP>] add a new IPCP over UDP/IPv6 to the system. # [broadcast.<name of IPCP>] add a new broadcast IPCP to the system. # [unicast.<name of IPCP>] add a new unicast IPCP to the system. # diff --git a/src/irmd/CMakeLists.txt b/src/irmd/CMakeLists.txt index 79f806bb..a9584b85 100644 --- a/src/irmd/CMakeLists.txt +++ b/src/irmd/CMakeLists.txt @@ -20,9 +20,14 @@ if (LIBTOML_LIBRARIES) message(STATUS "Configuration directory: ${OUROBOROS_CONFIG_DIR}") set(INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") configure_file("${CMAKE_SOURCE_DIR}/irmd.conf.in" - "${CMAKE_BINARY_DIR}/irmd.conf.example" @ONLY) - install(FILES "${CMAKE_BINARY_DIR}/irmd.conf.example" + "${CMAKE_BINARY_DIR}/${OUROBOROS_CONFIG_FILE}.example" @ONLY) + install(FILES "${CMAKE_BINARY_DIR}/${OUROBOROS_CONFIG_FILE}.example" DESTINATION "${OUROBOROS_CONFIG_DIR}") + install(CODE " + if (NOT EXISTS \"${OUROBOROS_CONFIG_DIR}/${OUROBOROS_CONFIG_FILE}\") + file(WRITE \"${OUROBOROS_CONFIG_DIR}/${OUROBOROS_CONFIG_FILE}\" \"\") + endif() + ") unset(INSTALL_DIR) find_path(LIBTOML_INCLUDE toml.h) mark_as_advanced(LIBTOML_LIBRARIES LIBTOML_INCLUDE) |