diff options
| author | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2025-09-23 09:48:07 +0200 |
|---|---|---|
| committer | sarthurdev <965089+sarthurdev@users.noreply.github.com> | 2025-09-23 12:10:31 +0200 |
| commit | 868e45f86d39936ad04566e702ac95759b738149 (patch) | |
| tree | ac47138df7b20fe4be9f2573a077eb43397dd849 /src/etc | |
| parent | 25efe38a3a9ce7278e99500b1dcefc3f0a1abb27 (diff) | |
| download | vyos-1x-868e45f86d39936ad04566e702ac95759b738149.tar.gz vyos-1x-868e45f86d39936ad04566e702ac95759b738149.zip | |
kea: T7281: Preserve systemd unit environment in VRF exec
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/sudoers.d/vyos | 3 | ||||
| -rw-r--r-- | src/etc/systemd/system/isc-kea-dhcp4-server@.service | 2 | ||||
| -rw-r--r-- | src/etc/systemd/system/isc-kea-dhcp6-server@.service | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/etc/sudoers.d/vyos b/src/etc/sudoers.d/vyos index 2dd8850c4..0feaabc2e 100644 --- a/src/etc/sudoers.d/vyos +++ b/src/etc/sudoers.d/vyos @@ -48,6 +48,7 @@ Cmnd_Alias DIAGNOSTICS = /bin/ip vrf exec * /bin/ping *, \ Cmnd_Alias KEA_IP6_ROUTES = /sbin/ip -6 route replace *,\ /sbin/ip -6 route del * Cmnd_Alias KEA_DHCP = /bin/ip vrf exec * /usr/sbin/kea-dhcp*,\ + /usr/bin/chown * /var/run/kea/*,\ /usr/bin/chown * /run/kea/* %operator ALL=NOPASSWD: DATE, IPTABLES, ETHTOOL, IPFLUSH, HWINFO, \ PPPOE_CMDS, PCAPTURE, /usr/sbin/wanpipemon, \ @@ -64,4 +65,4 @@ Cmnd_Alias KEA_DHCP = /bin/ip vrf exec * /usr/sbin/kea-dhcp*,\ %sudo ALL=NOPASSWD: /usr/bin/mokutil _kea ALL=NOPASSWD: KEA_IP6_ROUTES -_kea ALL=NOPASSWD: KEA_DHCP +_kea ALL=NOPASSWD:SETENV: KEA_DHCP diff --git a/src/etc/systemd/system/isc-kea-dhcp4-server@.service b/src/etc/systemd/system/isc-kea-dhcp4-server@.service index 1139ab88b..588cca216 100644 --- a/src/etc/systemd/system/isc-kea-dhcp4-server@.service +++ b/src/etc/systemd/system/isc-kea-dhcp4-server@.service @@ -18,7 +18,7 @@ RuntimeDirectoryMode=0750 LogsDirectory=kea LogsDirectoryMode=0750 StateDirectory=kea -ExecStart=sudo /bin/ip vrf exec %i /usr/sbin/kea-dhcp4 -c /var/run/kea/kea-%i-dhcp4.conf +ExecStart=sudo -E /bin/ip vrf exec %i /usr/sbin/kea-dhcp4 -c /var/run/kea/kea-%i-dhcp4.conf ExecStartPost=/bin/sh -c 'sleep 10 && sudo /usr/bin/chown _kea:_kea /var/run/kea/dhcp4-%i-ctrl* && sudo /usr/bin/chown _kea:_kea /var/run/kea/kea-%i-dhcp4* && sudo /usr/bin/chown _kea:_kea /run/kea/logger_lockfile' Restart=on-failure diff --git a/src/etc/systemd/system/isc-kea-dhcp6-server@.service b/src/etc/systemd/system/isc-kea-dhcp6-server@.service index 2f115c0f7..7196239af 100644 --- a/src/etc/systemd/system/isc-kea-dhcp6-server@.service +++ b/src/etc/systemd/system/isc-kea-dhcp6-server@.service @@ -18,7 +18,7 @@ RuntimeDirectoryMode=0750 LogsDirectory=kea LogsDirectoryMode=0750 StateDirectory=kea -ExecStart=sudo /bin/ip vrf exec %i /usr/sbin/kea-dhcp6 -c /var/run/kea/kea-%i-dhcp6.conf +ExecStart=sudo -E /bin/ip vrf exec %i /usr/sbin/kea-dhcp6 -c /var/run/kea/kea-%i-dhcp6.conf ExecStartPost=/bin/sh -c 'sleep 10 && sudo /usr/bin/chown _kea:_kea /var/run/kea/dhcp6-%i-ctrl* && sudo /usr/bin/chown _kea:_kea /var/run/kea/kea-%i-dhcp6* && sudo /usr/bin/chown _kea:_kea /run/kea/logger_lockfile' Restart=on-failure |