Merge branch 'ipsec' into next

This commit is contained in:
Michael Tremer
2019-02-25 00:48:08 +00:00
32 changed files with 973 additions and 265 deletions

View File

@@ -76,7 +76,7 @@ usr/bin/captive-cleanup
#usr/lib
usr/lib/firewall
usr/lib/firewall/firewall-lib.pl
usr/lib/firewall/ipsec-block
usr/lib/firewall/ipsec-policy
usr/lib/firewall/rules.pl
#usr/lib/libgcc_s.so
usr/lib/libgcc_s.so.1
@@ -93,6 +93,7 @@ usr/local/bin/connscheduler
usr/local/bin/consort.sh
usr/local/bin/convert-ovpn
usr/local/bin/hddshutdown
usr/local/bin/ipsec-interfaces
usr/local/bin/makegraphs
usr/local/bin/qosd
usr/local/bin/readhash

View File

@@ -75,7 +75,7 @@ usr/bin/captive-cleanup
#usr/lib
usr/lib/firewall
usr/lib/firewall/firewall-lib.pl
usr/lib/firewall/ipsec-block
usr/lib/firewall/ipsec-policy
usr/lib/firewall/rules.pl
#usr/lib/libgcc_s.so
usr/lib/libgcc_s.so.1
@@ -91,6 +91,7 @@ usr/local/bin/connscheduler
usr/local/bin/consort.sh
usr/local/bin/convert-ovpn
usr/local/bin/hddshutdown
usr/local/bin/ipsec-interfaces
usr/local/bin/makegraphs
usr/local/bin/qosd
usr/local/bin/readhash

View File

@@ -76,7 +76,7 @@ usr/bin/captive-cleanup
#usr/lib
usr/lib/firewall
usr/lib/firewall/firewall-lib.pl
usr/lib/firewall/ipsec-block
usr/lib/firewall/ipsec-policy
usr/lib/firewall/rules.pl
#usr/lib/libgcc_s.so
usr/lib/libgcc_s.so.1
@@ -93,6 +93,7 @@ usr/local/bin/connscheduler
usr/local/bin/consort.sh
usr/local/bin/convert-ovpn
usr/local/bin/hddshutdown
usr/local/bin/ipsec-interfaces
usr/local/bin/makegraphs
usr/local/bin/qosd
usr/local/bin/readhash