diff options
| author | Romain Francoise <rfrancoise@debian.org> | 2014-07-26 17:56:25 +0200 |
|---|---|---|
| committer | Romain Francoise <rfrancoise@debian.org> | 2014-07-26 17:56:25 +0200 |
| commit | 1e90ef71efd5f3e487b48cd20e0eff94dbe6b822 (patch) | |
| tree | 1dc9412bc18c7250c563c92fa15843b55cdc1b2e | |
| parent | 6e408eb31340230d4c57da34aeab640098c78d1a (diff) | |
| download | vyos-strongswan-1e90ef71efd5f3e487b48cd20e0eff94dbe6b822.tar.gz vyos-strongswan-1e90ef71efd5f3e487b48cd20e0eff94dbe6b822.zip | |
Use After=network.target
Primarily because otherwise the network may go down before charon gets
the opportunity to send deletes on exit, and it matches what the old
init script did.
Note that in Debian, network.target apparently runs after ifup so the
network is in most cases really up, so we don't need
network-online.target. (And charon uses rtnetlink to get notified of
changes anyway.)
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/03_systemd-service.patch | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 7eff6689d..951a8141f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,13 +3,15 @@ strongswan (5.2.0-2) UNRELEASED; urgency=medium * Add systemd integration: + Install upstream systemd service file in strongswan-starter. + Alias strongswan.service to ipsec.service to match the sysv init script. - + Drop After=syslog.target, as syslog is socket-activated nowadays. + + Drop After=syslog.target (as syslog is socket-activated nowadays), but + add After=network.target to ensure that charon gets the chance to send + deletes on exit. + Add ExecReload for reload action, since the starter script has one. + Add --with-systemdsystemunitdir to configure options. + Add build-dep on dh-systemd, and use systemd dh addon. * Remove debian/patches/03_include-stdint.patch. - -- Romain Francoise <rfrancoise@debian.org> Sat, 26 Jul 2014 10:46:04 +0200 + -- Romain Francoise <rfrancoise@debian.org> Sat, 26 Jul 2014 17:54:05 +0200 strongswan (5.2.0-1) unstable; urgency=medium diff --git a/debian/patches/03_systemd-service.patch b/debian/patches/03_systemd-service.patch index bcf581295..d118590e2 100644 --- a/debian/patches/03_systemd-service.patch +++ b/debian/patches/03_systemd-service.patch @@ -1,9 +1,10 @@ --- a/init/systemd/strongswan.service.in +++ b/init/systemd/strongswan.service.in -@@ -1,10 +1,11 @@ +@@ -1,10 +1,12 @@ [Unit] Description=strongSwan IPsec -After=syslog.target ++After=network.target [Service] ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork |