Merge ~lucaskanashiro/ubuntu/+source/openvpn:eoan-drop-reload into ubuntu/+source/openvpn:ubuntu/eoan-devel

Proposed by Lucas Kanashiro on 2020-05-28
Status: Merged
Approved by: Lucas Kanashiro on 2020-05-29
Approved revision: ba0ccc2ebcb4282ab0fa99bddf6e943fc9f3a65c
Merged at revision: ba0ccc2ebcb4282ab0fa99bddf6e943fc9f3a65c
Proposed branch: ~lucaskanashiro/ubuntu/+source/openvpn:eoan-drop-reload
Merge into: ubuntu/+source/openvpn:ubuntu/eoan-devel
Diff against target: 46 lines (+6/-3)
3 files modified
debian/changelog (+6/-0)
debian/openvpn.service (+0/-1)
debian/openvpn@.service (+0/-2)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  2020-05-28 Approve on 2020-05-29
Ubuntu Server Developers 2020-05-28 Pending
Review via email: mp+384725@code.launchpad.net

Description of the change

Backport this patch to drop systemctl reload support from Focal:

https://code.launchpad.net/~lucaskanashiro/ubuntu/+source/openvpn/+git/openvpn/+merge/384585

It is not working for a while and the restart does something similar.

Here is a PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/eoan-openvpn-drop-reload/+packages

To post a comment you must log in.
Christian Ehrhardt  (paelzer) wrote :

We pre-discussed this, so you know I'm in favor of this approach.
+1

... I'm interested to see if the SRU team will have a different opinion on that

review: Approve
Lucas Kanashiro (lucaskanashiro) wrote :

$ git push pkg upload/2.4.7-1ubuntu2.19.10.1
Enumerating objects: 15, done.
Counting objects: 100% (15/15), done.
Delta compression using up to 8 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 1.20 KiB | 204.00 KiB/s, done.
Total 10 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/openvpn
 * [new tag] upload/2.4.7-1ubuntu2.19.10.1 -> upload/2.4.7-1ubuntu2.19.10.1

$ dput ubuntu ../openvpn_2.4.7-1ubuntu2.19.10.1_source.changes
Checking signature on .changes
gpg: ../openvpn_2.4.7-1ubuntu2.19.10.1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../openvpn_2.4.7-1ubuntu2.19.10.1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading openvpn_2.4.7-1ubuntu2.19.10.1.dsc: done.
  Uploading openvpn_2.4.7-1ubuntu2.19.10.1.debian.tar.xz: done.
  Uploading openvpn_2.4.7-1ubuntu2.19.10.1_source.changes: done.
Successfully uploaded packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index dcf699a..babf9ab 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+openvpn (2.4.7-1ubuntu2.19.10.1) eoan; urgency=medium
7+
8+ * Drop reload support from systemd unit files (LP: #1868127)
9+
10+ -- Lucas Kanashiro <kanashiro@ubuntu.com> Wed, 27 May 2020 19:25:32 -0300
11+
12 openvpn (2.4.7-1ubuntu2) eoan; urgency=medium
13
14 * No-change upload with strops.h and sys/strops.h removed in glibc.
15diff --git a/debian/openvpn.service b/debian/openvpn.service
16index 0075cc4..a4d1149 100644
17--- a/debian/openvpn.service
18+++ b/debian/openvpn.service
19@@ -9,7 +9,6 @@ After=network.target
20 Type=oneshot
21 RemainAfterExit=yes
22 ExecStart=/bin/true
23-ExecReload=/bin/true
24 WorkingDirectory=/etc/openvpn
25
26 [Install]
27diff --git a/debian/openvpn@.service b/debian/openvpn@.service
28index eb4be12..6d59b13 100644
29--- a/debian/openvpn@.service
30+++ b/debian/openvpn@.service
31@@ -1,7 +1,6 @@
32 [Unit]
33 Description=OpenVPN connection to %i
34 PartOf=openvpn.service
35-ReloadPropagatedFrom=openvpn.service
36 Before=systemd-user-sessions.service
37 After=network-online.target
38 Wants=network-online.target
39@@ -16,7 +15,6 @@ WorkingDirectory=/etc/openvpn
40 ExecStart=/usr/sbin/openvpn --daemon ovpn-%i --status /run/openvpn/%i.status 10 --cd /etc/openvpn --script-security 2 --config /etc/openvpn/%i.conf --writepid /run/openvpn/%i.pid
41 PIDFile=/run/openvpn/%i.pid
42 KillMode=process
43-ExecReload=/bin/kill -HUP $MAINPID
44 CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE CAP_AUDIT_WRITE
45 LimitNPROC=100
46 DeviceAllow=/dev/null rw

Subscribers

People subscribed via source and target branches