diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-06-17 22:48:33 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-06-17 22:48:33 +0200 |
| commit | ae345cb6f7382777af7c2b29d854ba99f44ff7c2 (patch) | |
| tree | f9c931707592c4d06468faba9c5edcf79ee69989 | |
| parent | 740ace13f36b78583434eabfbd324cf3d29e909d (diff) | |
| download | vyos-1x-ae345cb6f7382777af7c2b29d854ba99f44ff7c2.tar.gz vyos-1x-ae345cb6f7382777af7c2b29d854ba99f44ff7c2.zip | |
router-advert: T2185: migrate from SysVinit to systemd
| -rwxr-xr-x | src/conf_mode/service_router-advert.py | 2 | ||||
| -rw-r--r-- | src/etc/systemd/system/radvd.service.d/override.conf | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/src/conf_mode/service_router-advert.py b/src/conf_mode/service_router-advert.py index 89d4d5dd8..b7f918155 100755 --- a/src/conf_mode/service_router-advert.py +++ b/src/conf_mode/service_router-advert.py @@ -27,7 +27,7 @@ from vyos.template import render from vyos import airbag airbag.enable() -config_file = r'/etc/radvd.conf' +config_file = r'/run/radvd/radvd.conf' default_config_data = { 'interfaces': [] diff --git a/src/etc/systemd/system/radvd.service.d/override.conf b/src/etc/systemd/system/radvd.service.d/override.conf new file mode 100644 index 000000000..44c4345e1 --- /dev/null +++ b/src/etc/systemd/system/radvd.service.d/override.conf @@ -0,0 +1,17 @@ +[Unit]
+ConditionPathExists=/run/radvd/radvd.conf
+After=
+After=vyos-router.service
+
+[Service]
+WorkingDirectory=
+WorkingDirectory=/run/radvd
+ExecStartPre=
+ExecStartPre=/usr/sbin/radvd --logmethod stderr_clean --configtest --config /run/radvd/radvd.conf
+ExecStart=
+ExecStart=/usr/sbin/radvd --logmethod stderr_clean --config /run/radvd/radvd.conf --pidfile /run/radvd/radvd.pid
+ExecReload=
+ExecReload=/usr/sbin/radvd --logmethod stderr_clean --configtest --config /run/radvd/radvd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+PIDFile=
+PIDFile=/run/radvd/radvd.pid
|