From c229973076b1cf3546e5b579430c747ddca22448 Mon Sep 17 00:00:00 2001 From: MonkWho <31880166+MonkWho@users.noreply.github.com> Date: Wed, 6 May 2020 10:51:39 -0700 Subject: [PATCH] pfSense 2.4.5 cleanup --- bin/pfatt.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/bin/pfatt.sh b/bin/pfatt.sh index b381e74..5a69c8a 100755 --- a/bin/pfatt.sh +++ b/bin/pfatt.sh @@ -1,16 +1,11 @@ #!/bin/sh set -e -ONT_IF='em0' -RG_IF='em1' +ONT_IF='xx0' +RG_IF='xx1' RG_ETHER_ADDR='xx:xx:xx:xx:xx:xx' LOG=/var/log/pfatt.log -# Calculate pfsense version so we can manage some variations. -VERSION_MAJOR=`sed -nre 's/([0-9])+\.([0-9])+\.([0-9])+.*/\1/p' /etc/version` -VERSION_MINOR=`sed -nre 's/([0-9])+\.([0-9])+\.([0-9])+.*/\2/p' /etc/version` -VERSION_PATCH=`sed -nre 's/([0-9])+\.([0-9])+\.([0-9])+.*/\3/p' /etc/version` - getTimestamp(){ echo `date "+%Y-%m-%d %H:%M:%S :: [pfatt.sh] ::"` } @@ -22,12 +17,6 @@ getTimestamp(){ echo "$(getTimestamp) RG_IF: $RG_IF" echo "$(getTimestamp) RG_ETHER_ADDR: $RG_ETHER_ADDR" - if ( [ ${VERSION_MAJOR} -ge '2' ] && [ ${VERSION_MINOR} -ge '4' ] && [ ${VERSION_PATCH} -lt '5' ] ); then - echo -n "$(getTimestamp) loading netgraph kernel modules... " - /sbin/kldload -nq ng_etf - echo "OK!" - fi - echo -n "$(getTimestamp) attaching interfaces to ng_ether... " /usr/local/bin/php -r "pfSense_ngctl_attach('.', '$ONT_IF');" /usr/local/bin/php -r "pfSense_ngctl_attach('.', '$RG_IF');"