Fix configure substitutions in initscripts

This commit is contained in:
Pavel Šimerda
2012-07-09 02:00:25 +02:00
parent 1bd0239561
commit 457dae3058
2 changed files with 18 additions and 2 deletions

View File

@@ -39,7 +39,7 @@ Index: strongswan-5.0.0/init/sysvinit/strongswan.in
+# Source function library. +# Source function library.
+. /etc/rc.d/init.d/functions +. /etc/rc.d/init.d/functions
+ +
+exec="@SBINDIR@/@IPSEC_SCRIPT@" +exec="@sbindir@/@ipsec_script@"
+prog="strongswan" +prog="strongswan"
+status_prog="starter" +status_prog="starter"
+config="/etc/strongswan/strongswan.conf" +config="/etc/strongswan/strongswan.conf"
@@ -255,3 +255,16 @@ Index: strongswan-5.0.0/init/sysvinit/strongswan
+ exit 2 + exit 2
+esac +esac
+exit $? +exit $?
Index: strongswan-5.0.0/init/systemd/strongswan.service.in
===================================================================
--- strongswan-5.0.0.orig/init/systemd/strongswan.service.in
+++ strongswan-5.0.0/init/systemd/strongswan.service.in
@@ -3,7 +3,7 @@ Description=strongSwan IPsec
After=syslog.target
[Service]
-ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork
+ExecStart=@sbindir@/@ipsec_script@ start --nofork
StandardOutput=syslog
[Install]

View File

@@ -3,7 +3,7 @@
Name: strongswan Name: strongswan
Version: 5.0.0 Version: 5.0.0
Release: 1%{snapshot}%{?dist} Release: 2%{snapshot}%{?dist}
Summary: An OpenSource IPsec-based VPN Solution Summary: An OpenSource IPsec-based VPN Solution
Group: System Environment/Daemons Group: System Environment/Daemons
License: GPLv2+ License: GPLv2+
@@ -198,6 +198,9 @@ fi
%endif %endif
%changelog %changelog
* Sun Jul 08 2012 Pavel Šimerda <pavlix@pavlix.net> - 5.0.0-2.git20120619
- Fix configure substitutions in initscripts
* Wed Jul 04 2012 Pavel Šimerda <psimerda@redhat.com> - 5.0.0-1.git20120619 * Wed Jul 04 2012 Pavel Šimerda <psimerda@redhat.com> - 5.0.0-1.git20120619
- Update to current upstream release - Update to current upstream release
- Comment out all stuff that is only needed for git builds - Comment out all stuff that is only needed for git builds