[3/4] fastdstart: source fff-vpn if exists

Submitted by Robert Langhammer on May 3, 2016, 7:24 p.m.

Details

Message ID 1462303499-22494-4-git-send-email-rlanghammer@web.de
State Superseded, archived
Headers show

Commit Message

Robert Langhammer May 3, 2016, 7:24 p.m.
Signed-off-by: Robert Langhammer <rlanghammer@web.de>
---
 src/packages/fff/fff-fastd/files/usr/sbin/fastdstart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-fastd/files/usr/sbin/fastdstart b/src/packages/fff/fff-fastd/files/usr/sbin/fastdstart
index 611a3f8..2d5f0c0 100755
--- a/src/packages/fff/fff-fastd/files/usr/sbin/fastdstart
+++ b/src/packages/fff/fff-fastd/files/usr/sbin/fastdstart
@@ -85,7 +85,7 @@  if ping -w5 -c3 "$test_ipv4_host1" &>/dev/null ||
 		awk "{ if(a) print }; /^####$file.conf$/{a=1}; /^$/{a=0};" /tmp/fastd_${project}_output | sed 's/ float;/;/g' > /etc/fastd/$project/peers/$file
 		echo 'float yes;' >> /etc/fastd/$project/peers/$file
 	done
-
+	[ -f /usr/sbin/fff-vpn ] && . /usr/sbin/fff-vpn
 	#reload
 	kill -HUP $(cat /var/run/fastd.$project.pid)
 else

Comments

Tim Niemeyer May 7, 2016, 9:35 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Hi

Am 3. Mai 2016 21:24:58 MESZ, schrieb Robert Langhammer <rlanghammer@web.de>:
>Signed-off-by: Robert Langhammer <rlanghammer@web.de>
>---
> src/packages/fff/fff-fastd/files/usr/sbin/fastdstart | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/packages/fff/fff-fastd/files/usr/sbin/fastdstart
>b/src/packages/fff/fff-fastd/files/usr/sbin/fastdstart
>index 611a3f8..2d5f0c0 100755
>--- a/src/packages/fff/fff-fastd/files/usr/sbin/fastdstart
>+++ b/src/packages/fff/fff-fastd/files/usr/sbin/fastdstart
>@@ -85,7 +85,7 @@ if ping -w5 -c3 "$test_ipv4_host1" &>/dev/null ||
>		awk "{ if(a) print }; /^####$file.conf$/{a=1}; /^$/{a=0};"
>/tmp/fastd_${project}_output | sed 's/ float;/;/g' >
>/etc/fastd/$project/peers/$file
> 		echo 'float yes;' >> /etc/fastd/$project/peers/$file
> 	done
>-
>+	[ -f /usr/sbin/fff-vpn ] && . /usr/sbin/fff-vpn

Ich finde die fastd Sachen und die l2tp Sachen sollten beide unabhängig von einander sein. Beide sollten dann jeweils von aussen verwendet werden können oder eben nicht.

Tim

> 	#reload
> 	kill -HUP $(cat /var/run/fastd.$project.pid)
> else
-----BEGIN PGP SIGNATURE-----

iQE5BAEBCgAjHBxUaW0gTmllbWV5ZXIgPHRpbUB0bi14Lm9yZz4FAlcuX6EACgkQ
ELiw0DPkKM/Pgwf/YzffR6V7GRkmbJi4kaZ5I7y/GGbPJL04J9Y9UXlLF2Pa/9td
AU+QBuKZNB+bXChrWgMmmh8Uc2VNXt+jPZfbt6F4B9jku7j6dQ9MpSGHha6JxVcC
SWfofVnTQgOlajdnXpLEdMmR8flTcrNnnx9HC+N8l4zO/DknNJOFJP5+sL19JzsG
wweqU5QRGozSO18dnx6DlhNBf5BXkogK1soWqzlDs8dCE1U5LnKYXoYYMdvXggSV
xvvELlIQHdGXSkjRoOFXCP25nq7CSqRjoq6yNc879EOPymUwsHkd8LOQXQL8WB9b
Fe1CVvpg0nNx2DtYNeSyfQWi2O83FZEiMEvkNQ==
=1i4L
-----END PGP SIGNATURE-----