[PC-BSD Commits] r7873 - pcbsd/current/system-overlay/usr/local/share/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2010-10-21 15:04:22 -0700 (Thu, 21 Oct 2010)
New Revision: 7873

Modified:
   pcbsd/current/system-overlay/usr/local/share/pcbsd/scripts/portjail.sh
Log:

Remove pf.conf entries before doing jail shutdown, since jail shutdown
may be taking LONG time to finish



Modified: pcbsd/current/system-overlay/usr/local/share/pcbsd/scripts/portjail.sh
===================================================================
--- pcbsd/current/system-overlay/usr/local/share/pcbsd/scripts/portjail.sh	2010-10-21 22:02:45 UTC (rev 7872)
+++ pcbsd/current/system-overlay/usr/local/share/pcbsd/scripts/portjail.sh	2010-10-21 22:04:22 UTC (rev 7873)
@@ -117,6 +117,9 @@
     exit 1
   fi
 
+  # Cleanup /etc/pf.conf
+  sed -i "" -e '/.*from lo1:network to any/d' /etc/pf.conf
+
   # Stop the Jail
   jexec portjail /bin/sh /etc/rc.shutdown
   jail -r portjail
@@ -129,9 +132,6 @@
   umount ${PJDIR}/usr/src
   ifconfig lo1 destroy
 
-  # Cleanup /etc/pf.conf
-  sed -i "" -e '/.*from lo1:network to any/d' /etc/pf.conf
-
 elif [ "$1" = "console" ]
 then
   DBUS_SESSION_BUS_ADDRESS="" ; export DBUS_SESSION_BUS_ADDRESS