[xl2tpd/epel7] - Remove kmod require, not recognised and l2tp_ppp.ko is in core kernel package now - Update service

[Paul Wouters]

commit a8a1f1d370fa0720ed52ff9c19b8295db3452a38
Author: Paul Wouters <pwouters at redhat.com>
Date:   Fri Oct 31 17:59:44 2014 -0400

    - Remove kmod require, not recognised and l2tp_ppp.ko is in core kernel package now
    - Update service file to use Restart=always and require network-online.target

 xl2tpd.service |    5 +++--
 xl2tpd.spec    |    8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/xl2tpd.service b/xl2tpd.service
index 082b4ff..a4c6c2f 100644
--- a/xl2tpd.service
+++ b/xl2tpd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Level 2 Tunnel Protocol Daemon (L2TP)
-After=network.target
+Wants=network-online.target
+After=network-online.target
 After=ipsec.service
 # Some ISPs in Russia use l2tp without IPsec, so don't insist anymore
 #Wants=ipsec.service
@@ -10,7 +11,7 @@ Type=simple
 PIDFile=/var/run/xl2tpd/xl2tpd.pid
 ExecStartPre=/sbin/modprobe -q l2tp_ppp
 ExecStart=/usr/sbin/xl2tpd -D
-Restart=on-abort
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/xl2tpd.spec b/xl2tpd.spec
index c4ef5e4..28d1093 100644
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@ -3,7 +3,7 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
 Version: 1.3.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL+
 Url: https://github.com/xelerance/%{name}/
 Group: System Environment/Daemons
@@ -14,7 +14,7 @@ Patch1: xl2tpd-1.3.6-conf.patch
 Patch2: xl2tpd-1.3.6-md5-fips.patch
 Patch3: xl2tpd-1.3.6-saref.patch
 
-Requires: ppp >= 2.4.5-18, kmod(l2tp_ppp.ko)
+Requires: ppp >= 2.4.5-18
 # If you want to authenticate against a Microsoft PDC/Active Directory
 # Requires: samba-winbind
 BuildRequires: libpcap-devel
@@ -112,6 +112,10 @@ install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd
 %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
 
 %changelog
+* Fri Oct 31 2014 Paul Wouters <pwouters at redhat.com> - 1.3.6-7
+- Remove kmod require, not recognised and l2tp_ppp.ko is in core kernel package now
+- Update service file to use Restart=always and require network-online.target
+
 * Thu Aug 21 2014 Kevin Fenzi <kevin at scrye.com> - 1.3.6-6
 - Rebuild for rpm bug 1131960