diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-07-25 21:32:48 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-07-25 21:32:48 +0200 |
| commit | 56255d62fe1afe9da83e50478a89a720a7dd08ab (patch) | |
| tree | a19acc0f40860c74c41cdc1b3a6c6269da08b9ee /src/systemd | |
| parent | b7dfe4e1484df5c711ea81d360643f0331c518c8 (diff) | |
| download | vyos-1x-56255d62fe1afe9da83e50478a89a720a7dd08ab.tar.gz vyos-1x-56255d62fe1afe9da83e50478a89a720a7dd08ab.zip | |
Revert "Merge pull request #423 from thomas-mangin/T2494"
This reverts commit bfbf51acb2d4b6b5fe2d22d39f7259686f98d2a0, reversing
changes made to 1a85e758b105d493bb9d95916816bd206345bc5d.
Diffstat (limited to 'src/systemd')
| -rw-r--r-- | src/systemd/vyos-hostsd.service | 6 | ||||
| -rw-r--r-- | src/systemd/vyos-http-api.service | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/systemd/vyos-hostsd.service b/src/systemd/vyos-hostsd.service index 26e9c745e..b77335778 100644 --- a/src/systemd/vyos-hostsd.service +++ b/src/systemd/vyos-hostsd.service @@ -1,6 +1,5 @@ [Unit] Description=VyOS DNS configuration keeper -Before=vyos-router.service # Without this option, lots of default dependencies are added, # among them network.target, which creates a dependency cycle @@ -15,7 +14,7 @@ WorkingDirectory=/run/vyos-hostsd RuntimeDirectory=vyos-hostsd RuntimeDirectoryPreserve=yes ExecStart=/usr/bin/python3 -u /usr/libexec/vyos/services/vyos-hostsd -Type=notify +Type=idle KillMode=process SyslogIdentifier=vyos-hostsd @@ -23,6 +22,7 @@ SyslogFacility=daemon Restart=on-failure +# Does't work in Jessie but leave it here User=root Group=hostsd @@ -31,4 +31,4 @@ Group=hostsd # Note: After= doesn't actually create a dependency, # it just sets order for the case when both services are to start, # and without RequiredBy it *does not* set vyos-hostsd to start. -WantedBy=vyos.target +RequiredBy=cloud-init-local.service vyos-router.service diff --git a/src/systemd/vyos-http-api.service b/src/systemd/vyos-http-api.service index 74a97d193..4fa68b4ff 100644 --- a/src/systemd/vyos-http-api.service +++ b/src/systemd/vyos-http-api.service @@ -4,8 +4,9 @@ After=auditd.service systemd-user-sessions.service time-sync.target vyos-router. Requires=vyos-router.service [Service] +ExecStartPre=/usr/libexec/vyos/init/vyos-config ExecStart=/usr/bin/python3 -u /usr/libexec/vyos/services/vyos-http-api-server -Type=notify +Type=idle KillMode=process SyslogIdentifier=vyos-http-api @@ -13,8 +14,11 @@ SyslogFacility=daemon Restart=on-failure +# Does't work but leave it here User=root Group=vyattacfg [Install] -WantedBy=vyos.target +# Installing in a earlier target leaves ExecStartPre waiting +WantedBy=getty.target + |