diff options
| author | Mika Havela <mika.havela@gmail.com> | 2009-07-27 08:37:46 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-08-05 14:27:06 +0000 |
| commit | b7ad33674367a8de6d87b78f4049390e90fcb11f (patch) | |
| tree | ae4d048940131f9245cc80b975f14c58b4186b80 | |
| parent | 665a1bf85070cf159211ed46187d3633cf3a6b83 (diff) | |
| download | alpine_aports-b7ad33674367a8de6d87b78f4049390e90fcb11f.tar.bz2 alpine_aports-b7ad33674367a8de6d87b78f4049390e90fcb11f.tar.xz alpine_aports-b7ad33674367a8de6d87b78f4049390e90fcb11f.zip | |
Adding SETKEY_OPTS parameter to init.d and conf.d files This helps users to append e.g. '-k' option to the setkey command by modifying their /etc/conf.d/racoon file
| -rw-r--r-- | main/ipsec-tools/racoon.confd | 1 | ||||
| -rw-r--r-- | main/ipsec-tools/racoon.initd | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/main/ipsec-tools/racoon.confd b/main/ipsec-tools/racoon.confd index 66f8ed7674..bf9926c5b5 100644 --- a/main/ipsec-tools/racoon.confd +++ b/main/ipsec-tools/racoon.confd | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | # for valid command-line options | 8 | # for valid command-line options |
| 9 | 9 | ||
| 10 | RACOON_OPTS="-4" | 10 | RACOON_OPTS="-4" |
| 11 | SETKEY_OPTS="" | ||
| 11 | 12 | ||
| 12 | RACOON_CONF="/etc/racoon/racoon.conf" | 13 | RACOON_CONF="/etc/racoon/racoon.conf" |
| 13 | RACOON_PSK_FILE="/etc/racoon/psk.txt" | 14 | RACOON_PSK_FILE="/etc/racoon/psk.txt" |
diff --git a/main/ipsec-tools/racoon.initd b/main/ipsec-tools/racoon.initd index 16fdec7e3a..0ed4efe500 100644 --- a/main/ipsec-tools/racoon.initd +++ b/main/ipsec-tools/racoon.initd | |||
| @@ -36,7 +36,7 @@ checkconfig() { | |||
| 36 | start() { | 36 | start() { |
| 37 | checkconfig || return 1 | 37 | checkconfig || return 1 |
| 38 | einfo "Loading ipsec policies from ${SETKEY_CONF}." | 38 | einfo "Loading ipsec policies from ${SETKEY_CONF}." |
| 39 | /usr/sbin/setkey -f ${SETKEY_CONF} | 39 | /usr/sbin/setkey ${SETKEY_OPTS} -f ${SETKEY_CONF} |
| 40 | if [ $? -eq 1 ] ; then | 40 | if [ $? -eq 1 ] ; then |
| 41 | eerror "Error while loading ipsec policies" | 41 | eerror "Error while loading ipsec policies" |
| 42 | fi | 42 | fi |