Merge pull request 'Freebsd 13' (#55) from reedmcintosh/FreeBSD-13 into master

Reviewed-on: #55

bin/gen-duid.sh

@@ -6,13 +6,13 @@ printhexstring() { awk '{l=split($0,c,"");for(i=1;i<l-1;i=i+2)printf("%s:",subst
 echo
 echo "Step 1) RG information"
 echo
-while read -p "  Manufacturer [1=Pace, 2=Motorola/Arris]: " mfg; do
-        ([ "$mfg" = "1" ] || [ "$mfg" = "2" ]) && break
+while read -p "  Manufacturer [1=Pace, 2=Motorola/Arris, 3=Nokia]: " mfg; do
+        ([ "$mfg" = "1" ] || [ "$mfg" = "2" ] || [ "$mfg" = "3" ]) && break
 done
 while read -p "  Serial number: " serial; do [ -n "$serial" ] && break; done
 echo
 
-[ "$mfg" = "1" ] && mfg="00D09E" || mfg="001E46"
+[ "$mfg" = "1" ] && mfg="00D09E" || [ "$mfg" = "2" ] && mfg="001E46" || [ "$mfg" = "3" ] && mfg="207852"
 echo -n "Identifier: "
 ascii2hex "$mfg-$serial" | printhexstring
 

bin/pfatt.sh

@@ -18,8 +18,10 @@ getTimestamp(){
     echo "$(getTimestamp) RG_ETHER_ADDR: $RG_ETHER_ADDR"
 
     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');"
+    # Only needed for older versions of pfatt. Newer versions handle this automatically.
+    # Eventually this can be remove.
+    /usr/local/bin/php -r "function_exists('pfSense_ngctl_attach') && pfSense_ngctl_attach('.', '$ONT_IF');"
+    /usr/local/bin/php -r "function_exists('pfSense_ngctl_attach') && pfSense_ngctl_attach('.', '$RG_IF');"
     echo "OK!"
 
     echo "$(getTimestamp) building netgraph nodes..."
@@ -80,7 +82,8 @@ getTimestamp(){
     echo "OK!"
 
     echo -n "$(getTimestamp) enabling promiscuous mode on $ONT_IF... "
-    /sbin/ifconfig $ONT_IF promisc
+    # Updated as per https://github.com/MonkWho/pfatt/issues/65
+    /sbin/ifconfig $ONT_IF promisc -vlanhwtag -vlanhwfilter -vlanhwtso
     echo "OK!"
 
     echo "$(getTimestamp) ngeth0 should now be available to configure as your pfSense WAN"