Browse Source

Cherry-pick upstream commit "Correct dependency order of systemd unit files"

Christoph Biedl 5 years ago
parent
commit
8457637a62

+ 33 - 0
debian/patches/cherry-pick.v6-5-g7d2035b.correct-dependency-order-of-systemd-unit-files.patch

@@ -0,0 +1,33 @@
+Subject: Correct dependency order of systemd unit files
+Origin: v6-5-g7d2035b
+Upstream-Author: Nathaniel McCallum <npmccallum@redhat.com>
+Date: Thu Jul 12 12:09:00 2018 +0200
+
+    The socket shouldn't open until all the other units have completed.
+    
+    Fixes: #22
+
+--- a/units/tangd.socket.in
++++ b/units/tangd.socket.in
+@@ -1,7 +1,10 @@
+ [Unit]
+ Description=Tang Server socket
+-Requires=tangd-update.path
+ Requires=tangd-keygen.service
++Requires=tangd-update.service
++Requires=tangd-update.path
++After=tangd-keygen.service
++After=tangd-update.service
+ 
+ [Socket]
+ ListenStream=80
+--- a/units/tangd@.service.in
++++ b/units/tangd@.service.in
+@@ -1,7 +1,5 @@
+ [Unit]
+ Description=Tang Server
+-Requires=tangd-update.path
+-Requires=tangd-keygen.service
+ 
+ [Service]
+ StandardInput=socket

+ 1 - 0
debian/patches/series

@@ -0,0 +1 @@
+cherry-pick.v6-5-g7d2035b.correct-dependency-order-of-systemd-unit-files.patch