Changeset 10594 in hybrid for branches/releng-9.0

Timestamp:

Apr 26, 2012, 3:37:50 PM (13 years ago)

Author:

rick

Message:

Well... default route for ileiden is mandatory of course.

File:

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

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

@@ -6 +6 @@
 # Rick van der Zwet <rick@wirelessleiden.nl>
 
+# Little hack to load the available functions in case we are running this as an
+# standalone script (for testing mostly).
+if [ -z "$exit_status" ]; then
+ grep -v 'exit $exit_status' /sbin/dhclient-script | eval
+fi
+
 . /etc/rc.subr
 
 : ${service_proxy_normal="NO"}
+: ${service_proxy_ileiden="NO"}
 : ${service_accesspoint="NO"}
 
 load_rc_config 'ileiden'
 
-# Little hack to load the available functions in case we are running this as an
-# standalone script (for testing mostly).
-[ -z "$exit_status" ] && . /sbin/dhclient-script
+update_pf_conf() {
+  # Make sure not to nuke the default route on an ileiden proxy,
+  # as it will rendering it usefull
+  checkyesno "service_proxy_ileiden" || return
 
-
-update_pf_conf() {
   if checkyesno "service_proxy_normal" && checkyesno "service_accesspoint"; then
     if is_default_interface; then
@@ -36 +42 @@
 }
 
+reason=${reason:-$FORCE}
+
 case $reason in
   BOUND|RENEW|REBIND|REBOOT)