diff options
| author | Romain Francoise <rfrancoise@debian.org> | 2015-04-04 18:01:26 +0200 |
|---|---|---|
| committer | Romain Francoise <rfrancoise@debian.org> | 2015-04-04 18:01:26 +0200 |
| commit | 1b7c683a32c62b6e08ad7bf5af39b9f4edd634f3 (patch) | |
| tree | 8ff3774a837a26be25d3ca872a4ac85734d8bfaf /debian/patches | |
| parent | 1e82f6c6c4231c3aeb4c20bd56d8aa26852625f7 (diff) | |
| download | vyos-strongswan-1b7c683a32c62b6e08ad7bf5af39b9f4edd634f3.tar.gz vyos-strongswan-1b7c683a32c62b6e08ad7bf5af39b9f4edd634f3.zip | |
Fix handling of ipsec name under systemd (#781209)
We used to make the old ipsec name, which corresponds to the sysvinit
init script, available via an Alias directive in the systemd service
file (which follows upstream and is named strongswan.service).
Unfortunately this results in a situation where the strongswan-starter
postinst calls invoke-rc.d using the ipsec name before the service has
been installed, and thus uses the sysvinit script instead of systemd's
native unit. This results in some confusion later when the unit gets
installed.
To avoid this, ship a symlink in the package, this way the ipsec name is
available as soon as the package has been unpacked. Thanks to Michael
Biebl for the suggestion.
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/03_systemd-service.patch | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/debian/patches/03_systemd-service.patch b/debian/patches/03_systemd-service.patch index 6609542c8..b1d1c874d 100644 --- a/debian/patches/03_systemd-service.patch +++ b/debian/patches/03_systemd-service.patch @@ -1,6 +1,6 @@ --- a/init/systemd/strongswan.service.in +++ b/init/systemd/strongswan.service.in -@@ -1,10 +1,12 @@ +@@ -1,9 +1,10 @@ [Unit] Description=strongSwan IPsec IKEv1/IKEv2 daemon using ipsec.conf -After=syslog.target @@ -12,5 +12,3 @@ StandardOutput=syslog [Install] - WantedBy=multi-user.target -+Alias=ipsec.service |