Changeset 10598 in hybrid for branches/releng-9.0/nanobsd

Timestamp:

Apr 26, 2012, 6:42:03 PM (13 years ago)

Author:

rick

Message:

Put it into logical brain ordering...

File:

• branches/releng-9.0/nanobsd/files/etc/dhclient-exit-hooks (modified) (2 diffs)

branches/releng-9.0/nanobsd/files/etc/dhclient-exit-hooks

@@ -21 +21 @@
 
 update_pf_conf() {
+  if is_default_interface; then
+    new_ext_if_gw=`route -n get default | awk '/gateway/ {print $2}'`
+    if [ -n "$new_ext_if_gw" ]; then
+      if [ -a "$new_ext_if_gw" != "$ext_if_gw" ];  then
+        info "Reloading PF firewall to load new ext_if_gw=$ext_if_gw"
+        { grep -v '^ext_if_gw=' $rc_conf_running; echo "ext_if_gw=$new_ext_if_gw"; } > $rc_conf_running
+        /etc/rc.d/pf reload
+      fi
+    fi
+  fi
+
   # Make sure not to nuke the default route on an ileiden proxy,
   # as it will rendering it usefull
@@ -26 +37 @@
 
   if checkyesno "service_proxy_normal" && checkyesno "service_accesspoint"; then
-    if is_default_interface; then
-      new_ext_if_gw=`route -n get default | awk '/gateway/ {print $2}'`
-      if [ -n "$new_ext_if_gw" ]; then
-        if [ -a "$new_ext_if_gw" != "$ext_if_gw" ];  then
-         info "Reloading PF firewall to load new ext_if_gw=$ext_if_gw"
-         { grep -v '^ext_if_gw=' $rc_conf_running; echo "ext_if_gw=$new_ext_if_gw"; } > $rc_conf_running
-         /etc/rc.d/pf reload
-        fi
-  
-        warn "Removing default route as machine is marked as service_proxy AND service_accesspoint"
-        route -q del default
-      fi
-    fi
+    warn "Removing default route as machine is marked as service_proxy AND service_accesspoint"
+    route -q del default
   fi
 }