mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 07:00:43 +00:00
27a8cada79
This causes OpenVPN services to reach the "active" state when the VPN connection is up (i.e., after OpenVPN prints "Initialization Sequence Completed"). This allows units to be ordered correctly after openvpn-* units, and makes systemctl present a password prompt: $ start openvpn-foo Enter Private Key Password: ************* (I first tried to implement this by calling "systemd-notify --ready" from the "up" script, but systemd-notify is not reliable.)
23 lines
637 B
Diff
23 lines
637 B
Diff
diff -ru -x '*~' openvpn-2.3.1-orig/src/openvpn/init.c openvpn-2.3.1/src/openvpn/init.c
|
|
--- openvpn-2.3.1-orig/src/openvpn/init.c 2013-03-20 09:28:14.000000000 +0100
|
|
+++ openvpn-2.3.1/src/openvpn/init.c 2014-04-22 13:02:21.351026640 +0200
|
|
@@ -48,6 +48,8 @@
|
|
|
|
#include "occ-inline.h"
|
|
|
|
+#include <systemd/sd-daemon.h>
|
|
+
|
|
static struct context *static_context; /* GLOBAL */
|
|
|
|
/*
|
|
@@ -1241,6 +1243,9 @@
|
|
{
|
|
static const char message[] = "Initialization Sequence Completed";
|
|
|
|
+ /* Tell systemd we're ready. */
|
|
+ sd_notify(0, "READY=1");
|
|
+
|
|
/* If we delayed UID/GID downgrade or chroot, do it now */
|
|
do_uid_gid_chroot (c, true);
|
|
|