diff options
author | Joerg Hofrichter <joerg.hofrichter@ni.com> | 2020-05-13 21:20:04 +0200 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-07-16 10:00:12 -0500 |
commit | 58601da0389035dbb0a109a516da214f9877c0fc (patch) | |
tree | 3e42e4b7cdbe8fa7ed91caea98436003ed10ac92 | |
parent | 2dd09111cfb237b4cc679e93d0391a50fb2df2d0 (diff) | |
download | uhd-58601da0389035dbb0a109a516da214f9877c0fc.tar.gz uhd-58601da0389035dbb0a109a516da214f9877c0fc.tar.bz2 uhd-58601da0389035dbb0a109a516da214f9877c0fc.zip |
mpm: systemd: added systemd configuration files for network
Added files which were previously maintained in meta-ettus
repository but which are better placed alongside MPM itself:
- eth0/int0/sfp0/sfp1.network: network configuration files
- 70-sfp-net.rules: udev rule for automatically naming the
network interfaces
Signed-off-by: Joerg Hofrichter <joerg.hofrichter@ni.com>
-rw-r--r-- | mpm/systemd/CMakeLists.txt | 28 | ||||
-rw-r--r-- | mpm/systemd/network/eth0.network | 11 | ||||
-rw-r--r-- | mpm/systemd/network/int0.network | 9 | ||||
-rw-r--r-- | mpm/systemd/network/sfp0.network | 8 | ||||
-rw-r--r-- | mpm/systemd/network/sfp1.network | 8 | ||||
-rw-r--r-- | mpm/systemd/sysctl/usrp-hwd.conf (renamed from mpm/systemd/usrp-hwd.conf) | 0 | ||||
-rw-r--r-- | mpm/systemd/system/usrp-hwd.service.in (renamed from mpm/systemd/usrp-hwd.service.in) | 0 | ||||
-rw-r--r-- | mpm/systemd/udev/70-sfp-net.rules | 3 |
8 files changed, 63 insertions, 4 deletions
diff --git a/mpm/systemd/CMakeLists.txt b/mpm/systemd/CMakeLists.txt index da811c30f..b8f6e5901 100644 --- a/mpm/systemd/CMakeLists.txt +++ b/mpm/systemd/CMakeLists.txt @@ -13,17 +13,37 @@ message(STATUS "Systemd system unit directory ${SYSTEMD_SYSTEM_UNITDIR}") PKG_GET_VARIABLE(SYSTEMD_SYSCTLDIR systemd sysctldir) message(STATUS "Systemd sysctl directory ${SYSTEMD_SYSCTLDIR}") +PKG_GET_VARIABLE(UDEV_UDEVDIR udev udevdir) +message(STATUS "Udev directory ${UDEV_UDEVDIR}") + configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/usrp-hwd.service.in - ${CMAKE_CURRENT_BINARY_DIR}/usrp-hwd.service + ${CMAKE_CURRENT_SOURCE_DIR}/system/usrp-hwd.service.in + ${CMAKE_CURRENT_BINARY_DIR}/system/usrp-hwd.service ) +# service files install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/usrp-hwd.service + ${CMAKE_CURRENT_BINARY_DIR}/system/usrp-hwd.service DESTINATION ${SYSTEMD_SYSTEM_UNITDIR} ) +# network configuration files +install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/network/eth0.network + ${CMAKE_CURRENT_SOURCE_DIR}/network/int0.network + ${CMAKE_CURRENT_SOURCE_DIR}/network/sfp0.network + ${CMAKE_CURRENT_SOURCE_DIR}/network/sfp1.network + DESTINATION ${SYSTEMD_SYSTEM_UNITDIR}/../network +) + +# sysctl configuration files install(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/usrp-hwd.conf + ${CMAKE_CURRENT_SOURCE_DIR}/sysctl/usrp-hwd.conf DESTINATION ${SYSTEMD_SYSCTLDIR} ) + +# udev rules +install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/udev/70-sfp-net.rules + DESTINATION ${UDEV_UDEVDIR}/rules.d +) diff --git a/mpm/systemd/network/eth0.network b/mpm/systemd/network/eth0.network new file mode 100644 index 000000000..f0c285070 --- /dev/null +++ b/mpm/systemd/network/eth0.network @@ -0,0 +1,11 @@ +[Match] +Name=eth0 +KernelCommandLine=!nfsroot + +[Network] +DHCP=ipv4 +IPForward=ipv4 + +[DHCP] +UseHostname=true +ClientIdentifier=mac diff --git a/mpm/systemd/network/int0.network b/mpm/systemd/network/int0.network new file mode 100644 index 000000000..1b939a2f9 --- /dev/null +++ b/mpm/systemd/network/int0.network @@ -0,0 +1,9 @@ +[Match] +Name=int0 + +[Network] +Address=169.254.0.1/24 +IPForward=ipv4 + +[Link] +MTUBytes=8000 diff --git a/mpm/systemd/network/sfp0.network b/mpm/systemd/network/sfp0.network new file mode 100644 index 000000000..f38c4977a --- /dev/null +++ b/mpm/systemd/network/sfp0.network @@ -0,0 +1,8 @@ +[Match] +Name=sfp0 + +[Network] +Address=192.168.10.2/24 + +[Link] +MTUBytes=9000 diff --git a/mpm/systemd/network/sfp1.network b/mpm/systemd/network/sfp1.network new file mode 100644 index 000000000..5350c960a --- /dev/null +++ b/mpm/systemd/network/sfp1.network @@ -0,0 +1,8 @@ +[Match] +Name=sfp1 + +[Network] +Address=192.168.20.2/24 + +[Link] +MTUBytes=9000 diff --git a/mpm/systemd/usrp-hwd.conf b/mpm/systemd/sysctl/usrp-hwd.conf index cf4996afa..cf4996afa 100644 --- a/mpm/systemd/usrp-hwd.conf +++ b/mpm/systemd/sysctl/usrp-hwd.conf diff --git a/mpm/systemd/usrp-hwd.service.in b/mpm/systemd/system/usrp-hwd.service.in index 4da4a31dc..4da4a31dc 100644 --- a/mpm/systemd/usrp-hwd.service.in +++ b/mpm/systemd/system/usrp-hwd.service.in diff --git a/mpm/systemd/udev/70-sfp-net.rules b/mpm/systemd/udev/70-sfp-net.rules new file mode 100644 index 000000000..3015dfdef --- /dev/null +++ b/mpm/systemd/udev/70-sfp-net.rules @@ -0,0 +1,3 @@ +SUBSYSTEM=="net", KERNELS=="40000000.ethernet", NAME="sfp0" +SUBSYSTEM=="net", KERNELS=="40008000.ethernet", NAME="sfp1" +SUBSYSTEM=="net", KERNELS=="40020000.ethernet", NAME="int0" |