diff options
| author | Adrian-Ken Rueegsegger <ken@codelabs.ch> | 2013-01-22 16:13:15 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-03-19 15:23:45 +0100 |
| commit | 4dc3ef94a1b697c64bfc714bb129a5a5d0e1873c (patch) | |
| tree | 110112a21f40af9bb0ff005111eaf227143a08a6 /src/ipsec | |
| parent | 0aa5a4666914a5a786e98201fe6ebae81dbe8fbc (diff) | |
| download | strongswan-4dc3ef94a1b697c64bfc714bb129a5a5d0e1873c.tar.bz2 strongswan-4dc3ef94a1b697c64bfc714bb129a5a5d0e1873c.tar.xz | |
starter: Make daemon name configurable
A daemon can be specified using the '--daemon' command line parameter. This
tells starter to invoke a daemon other than 'charon'.
Additionally the ipsec script uses the environment variable DAEMON_NAME to tell
the starter which daemon to use.
Diffstat (limited to 'src/ipsec')
| -rw-r--r-- | src/ipsec/_ipsec.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ipsec/_ipsec.in b/src/ipsec/_ipsec.in index 6b406f6d9..3742b12c7 100644 --- a/src/ipsec/_ipsec.in +++ b/src/ipsec/_ipsec.in @@ -18,6 +18,9 @@ PATH="/sbin:/bin:/usr/sbin:/usr/bin:@IPSEC_SBINDIR@" export PATH +# set daemon name +[ -z "$DAEMON_NAME" ] && DAEMON_NAME="charon" + # name and version of the ipsec implementation OS_NAME=`uname -s` IPSEC_NAME="@IPSEC_NAME@" @@ -30,8 +33,8 @@ IPSEC_CONFDIR="@IPSEC_CONFDIR@" IPSEC_PIDDIR="@IPSEC_PIDDIR@" IPSEC_SCRIPT="@IPSEC_SCRIPT@" -IPSEC_STARTER_PID="${IPSEC_PIDDIR}/starter.pid" -IPSEC_CHARON_PID="${IPSEC_PIDDIR}/charon.pid" +IPSEC_STARTER_PID="${IPSEC_PIDDIR}/starter.${DAEMON_NAME}.pid" +IPSEC_CHARON_PID="${IPSEC_PIDDIR}/${DAEMON_NAME}.pid" IPSEC_STROKE="${IPSEC_DIR}/stroke" IPSEC_STARTER="${IPSEC_DIR}/starter" @@ -220,7 +223,7 @@ start) if [ -d /var/lock/subsys ]; then touch /var/lock/subsys/ipsec fi - exec $IPSEC_STARTER "$@" + exec $IPSEC_STARTER --daemon $DAEMON_NAME "$@" ;; status|statusall) op="$1" |