Merge pull request #3078 from freenas/NAS-101726

NAS-101726 / 11.3 / NAS-101726: TrueNAS PF/failover cleanup
truenas · May 21, 2019 · 879ffa6 · 879ffa6
2 parents 049b8e8 + 4fed6ee
commit 879ffa6
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git a/nas_ports/freenas/freenas-files/Makefile b/nas_ports/freenas/freenas-files/Makefile
@@ -70,7 +70,6 @@ do-install:
 		${STAGEDIR}/boot/loader.conf \
 		${STAGEDIR}/boot/loader.rc.local \
 		${STAGEDIR}/etc/sysctl.conf \
-		${STAGEDIR}/etc/pf.conf.block \
 		${STAGEDIR}/etc/motd
 .endif
 	(cd ${STAGEDIR}; ${FIND} . \( -type f -o -type l \) \

diff --git a/src/freenas/etc/pf.conf.block b/src/freenas/etc/pf.conf.block
diff --git a/src/middlewared/middlewared/etc_files/rc.conf.py b/src/middlewared/middlewared/etc_files/rc.conf.py
@@ -345,7 +345,6 @@ def truenas_config(middleware, context):
         yield 'failover_enable="NO"'
     else:
         yield 'failover_enable="YES"'
-        yield 'pf_enable="YES"'
 
 
 def tunable_config(middleware, context):