From 2cd35e883e4356a2b6d59238223a86c95d9fce38 Mon Sep 17 00:00:00 2001
From: JulR <jul.reich43@opmbx.org>
Date: Sat, 12 Dec 2015 22:04:05 +0100
Subject: [PATCH] Init system detection

---
 openvpn-install.sh | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/openvpn-install.sh b/openvpn-install.sh
index 88c08e9..b1c3a4f 100644
--- a/openvpn-install.sh
+++ b/openvpn-install.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 # OpenVPN road warrior installer for Debian, Ubuntu and CentOS
 
-# This script will work on Debian, Ubuntu, CentOS and probably other distros
-# of the same families, although no support is offered for them. It isn't
-# bulletproof but it will probably work if you simply want to setup a VPN on
-# your Debian/Ubuntu/CentOS box. It has been designed to be as unobtrusive and
-# universal as possible.
+# This script is implemented as POSIX-compliant.
+# It should work on sh, dash, bash, ksh, zsh on Debian, Ubuntu, CentOS
+# and probably other distros of the same families,
+# although no support is offered for them. It isn't bulletproof but
+# it will probably work if you simply want to setup a VPN on
+# your Debian/Ubuntu/CentOS box. It has been designed to be
+# as unobtrusive and universal as possible.
 
 
 if [ "$(id -u)" != "0" ]
@@ -41,6 +43,16 @@ else
 	exit 4
 fi
 
+# Detect the init system
+# Return the PID of systemd if running
+pidof /sbin/init && INITSYS=sysvinit
+# Return the PID of systemd if running
+pidof systemd && INITSYS=systemd
+if [ "$INITSYS" = "" ]
+  then echo "Your init system isn't supported"
+  exit 5
+fi
+
 newclient() {
 	# Generates the custom client.ovpn
 	cp /etc/openvpn/client-common.txt ~/$1.ovpn
@@ -113,11 +125,9 @@ then
 			./easyrsa --batch revoke $CLIENT
 			./easyrsa gen-crl
 			# And restart
-			if pgrep systemd-journal
+			if [ $INITSYS = systemd ]
         then systemctl restart openvpn@server.service
-			elif [ $OS = debian ]
-        then /etc/init.d/openvpn restart
-      else
+			else
         service openvpn restart
 			fi
 			echo ""
@@ -307,12 +317,10 @@ crl-verify /etc/openvpn/easy-rsa/pki/crl.pem" >> /etc/openvpn/server.conf
 		sed -i "1 a\iptables -I FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT" $RCLOCAL
 	fi
 	# And finally, restart OpenVPN
-	if pgrep systemd-journal
+	if [ $INITSYS = systemd ]
   then # Little hack to check for systemd
     systemctl restart openvpn@server.service
     systemctl enable openvpn@server.service
-  elif [ $OS = debian ]
-  	then /etc/init.d/openvpn restart
 	else
     service openvpn restart
     chkconfig openvpn on