Changeset 10599 in genesis for tools

Timestamp:

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

Author:

rick

Message:

Get rid of all the /usr based binary hacking. Please do mind that the make_list
is an function defined in /etc/rc.conf and is thus custom for node configuration.

File:

• tools/gformat.py (modified) (2 diffs)

tools/gformat.py

@@ -517 +517 @@
   # Hybrid Configuration
   #
-  list_ileiden_proxies=`cat <<EOF | awk '{ print $1 }' | tr '\\n' ','
+  list_ileiden_proxies="
   {% for item in autogen_ileiden_proxies -%}
     {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
   {% endfor -%}
-  EOF`
-  list_normal_proxies=`cat <<EOF | awk '{ print $1 }' | tr '\\n' ','
+  "
+  list_normal_proxies="
   {% for item in autogen_normal_proxies -%}
     {{ "%-16s"|format(item.masterip) }} # {{ item.autogen_realname }}
   {% endfor -%}
-  EOF`
+  "
 
   captive_portal_interfaces="{{ autogen_dhcp_interfaces|default('none', true) }}"
@@ -546 +546 @@
     pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D masterip=$masterip"
     pf_flags="$pf_flags -D ext_if_gw=${ext_if_gw:-"{{ gateway|default('127.127.127.127') }}"}"
-    lvrouted_flags="$lvrouted_flags -z $list_ileiden_proxies"
+    lvrouted_flags="$lvrouted_flags -z `make_list "$list_ileiden_proxies" ","`"
   {% else %}
     pf_rules="/etc/pf.node.conf"