13 files changed, 112 insertions, 36 deletions
diff --git a/.gitignore b/.gitignore
index bcd4bd0f..07305450 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,26 @@
 *~
 *#
 .*.swp
-/aclocal.m4
-/autom4te.cache
-/build-stamp
-/config
-/config.log
-/config.guess
-/config.status
-/config.sub
-/configure
-/debian/files
-/debian/vyatta-cfg-quagga
-/debian/vyatta-cfg-quagga.debhelper.log
-/INSTALL
-/Makefile.in
-/Makefile
+aclocal.m4
+autom4te.cache
+build-stamp
+config
+config.log
+config.guess
+config.status
+config.sub
+configure
+debian/files
+debian/tmp
+debian/vyatta-cfg-quagga
+debian/vyatta-cfg-quagga-serial
+debian/*.debhelper.log
+debian/*.substvars
+INSTALL
+Makefile.in
+Makefile
 
-/src/.deps/
-/src/.dirstamp
+src/.deps/
+src/.dirstamp
 
 generated-templates
diff --git a/debian/changelog b/debian/changelog
index 921d7744..0e49c8a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,57 @@
+vyatta-cfg-quagga (0.18.106) unstable; urgency=low
+
+  * Split templates for serial device into separate package
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com>  Fri, 27 Aug 2010 10:21:52 -0700
+
+vyatta-cfg-quagga (0.18.105) unstable; urgency=low
+
+  * remove low-level config dir usage
+
+ -- An-Cheng Huang <ancheng@vyatta.com>  Tue, 17 Aug 2010 18:24:32 -0700
+
+vyatta-cfg-quagga (0.18.104) unstable; urgency=low
+
+  [ Robert Bays ]
+  * larkspur specific fix for 5971
+  * rename function to be more descriptive of the actual use
+  * fix for bug 5939
+  * fix for bug 6021
+  * fix for bug 4393
+
+  [ Stephen Hemminger ]
+  * Add missing step for peer group ttl-security
+
+ -- Stephen Hemminger <shemminger@lenny.localdomain>  Thu, 12 Aug 2010 08:23:51 -0700
+
+vyatta-cfg-quagga (0.18.103) unstable; urgency=low
+
+  [ Robert Bays ]
+  * fix for bug 5925
+  * fix for bug 5937
+  * fix for bug 5973
+
+  [ An-Cheng Huang ]
+  * cherry-pick larkspur fixes
+
+ -- An-Cheng Huang <ancheng@vyatta.com>  Tue, 10 Aug 2010 10:33:23 -0700
+
+vyatta-cfg-quagga (0.18.102) unstable; urgency=low
+
+  [ Robert Bays ]
+  * fix for bug 5892
+
+  [ An-Cheng Huang ]
+  * new API changes
+
+ -- An-Cheng Huang <ancheng@vyatta.com>  Fri, 30 Jul 2010 14:31:09 -0700
+
+vyatta-cfg-quagga (0.18.101) unstable; urgency=low
+
+  * UNRELEASED
+
+ -- An-Cheng Huang <ancheng@vyatta.com>  Thu, 22 Jul 2010 17:23:30 -0700
+
 vyatta-cfg-quagga (0.18.100+larkspur11) unstable; urgency=low
 
   * fix for bug 6054
diff --git a/debian/control b/debian/control
index f43920b4..a9b15eb7 100644
--- a/debian/control
+++ b/debian/control
@@ -22,3 +22,9 @@ Suggests: util-linux (>= 2.13-5),
  ntpdate
 Description: Vyatta configuration templates/scripts for Quagga
  Vyatta configuration templates and scripts for Quagga
+
+Package: vyatta-cfg-quagga-serial
+Architecture: all
+Depends:  vyatta-cfg-quagga
+Description: vyatta-cfg-quagga serial templates
+ Vyatta configuration templates for Quagga use on serial devices
diff --git a/debian/rules b/debian/rules
index 55ea74cf..682108fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-PACKAGE=vyatta-cfg-quagga
-PKGDIR=$(CURDIR)/debian/$(PACKAGE)
+PKGDIR=$(CURDIR)/debian/tmp
 
 CFLAGS = -Wall -g
 
@@ -72,8 +71,10 @@ install: build
 
 	$(MAKE) DESTDIR=$(PKGDIR) install
 
-	install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE)
-	install -D --mode=0644 debian/linda $(PKGDIR)/usr/share/linda/overrides/$(PACKAGE)
+	for p in vyatta-cfg-quagga vyatta-cfg-quagga-serial; do \
+	  install -D --mode=0644 debian/$$p.lintian-overrides \
+		debian/$$p/usr/share/lintian/overrides/$$p; \
+	done
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -82,7 +83,7 @@ binary-indep: build install
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_install
+	dh_install --sourcedir=debian/tmp
 	dh_installdebconf	
 	dh_link
 	dh_strip
diff --git a/debian/vyatta-cfg-quagga-serial.install b/debian/vyatta-cfg-quagga-serial.install
new file mode 100644
index 00000000..74b0475f
--- /dev/null
+++ b/debian/vyatta-cfg-quagga-serial.install
@@ -0,0 +1,3 @@
+opt/vyatta/share/vyatta-cfg/templates/interfaces/adsl
+opt/vyatta/share/vyatta-cfg/templates/interfaces/multilink
+opt/vyatta/share/vyatta-cfg/templates/interfaces/serial
diff --git a/debian/vyatta-cfg-quagga-serial.lintian-overrides b/debian/vyatta-cfg-quagga-serial.lintian-overrides
new file mode 100644
index 00000000..250f5718
--- /dev/null
+++ b/debian/vyatta-cfg-quagga-serial.lintian-overrides
@@ -0,0 +1,2 @@
+vyatta-cfg-quagga-serial: file-in-unusual-dir
+vyatta-cfg-quagga-serial: dir-or-file-in-opt
diff --git a/debian/vyatta-cfg-quagga.install b/debian/vyatta-cfg-quagga.install
new file mode 100644
index 00000000..a344ac5e
--- /dev/null
+++ b/debian/vyatta-cfg-quagga.install
@@ -0,0 +1,15 @@
+opt/vyatta/sbin
+opt/vyatta/etc
+opt/vyatta/share/perl5
+opt/vyatta/share/vyatta-cfg/templates/policy
+opt/vyatta/share/vyatta-cfg/templates/protocols
+opt/vyatta/share/vyatta-cfg/templates/system/gateway-address
+opt/vyatta/share/vyatta-cfg/templates/interfaces/bonding
+opt/vyatta/share/vyatta-cfg/templates/interfaces/bridge
+opt/vyatta/share/vyatta-cfg/templates/interfaces/ethernet
+opt/vyatta/share/vyatta-cfg/templates/interfaces/loopback
+opt/vyatta/share/vyatta-cfg/templates/interfaces/openvpn
+opt/vyatta/share/vyatta-cfg/templates/interfaces/pseudo-ethernet
+opt/vyatta/share/vyatta-cfg/templates/interfaces/tunnel
+opt/vyatta/share/vyatta-cfg/templates/interfaces/wireless
+opt/vyatta/share/vyatta-cfg/templates/interfaces/wirelessmodem
diff --git a/debian/lintian b/debian/vyatta-cfg-quagga.lintian-overrides
index 275491da..275491da 100644
--- a/debian/lintian
+++ b/debian/vyatta-cfg-quagga.lintian-overrides
diff --git a/lib/Vyatta/Quagga/Config.pm b/lib/Vyatta/Quagga/Config.pm
index 90a3d4d0..8afc1bed 100644
--- a/lib/Vyatta/Quagga/Config.pm
+++ b/lib/Vyatta/Quagga/Config.pm
@@ -399,7 +399,7 @@ sub _qtree {
 
           # This is either a set or delete on a single or multi: node
           if ($action eq 'set') {
-            my $tmplhash = $config->parseTmplAll(join ' ', "$level $node");
+            my $tmplhash = $config->parseTmplAll($node);
             if ($tmplhash->{'multi'}) {
               if ($_DEBUG > 2) { print "DEBUG: multi\n"; }
               @vals = $config->returnValues($node);
@@ -410,7 +410,7 @@ sub _qtree {
             }
           }
           else {
-            my $tmplhash = $config->parseTmplAll(join ' ', "$level $node");
+            my $tmplhash = $config->parseTmplAll($node);
             if ($tmplhash->{'multi'}) {
               if ($_DEBUG > 2) { print "DEBUG: multi\n"; }
               @vals = $config->returnOrigValues($node);
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def
index 1ba1af4f..6a1455cb 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/access-list/node.def
@@ -5,9 +5,7 @@ val_help: u32:100-199; IP extended access list number
 val_help: u32:1300-1999; IP standard access list number (expanded range)
 val_help: u32:2000-2699; IP extended access list number (expanded range)
 
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/access-list/* )
-        echo -n ${params[@]##*/}
+allowed: cli-shell-api listActiveNodes policy access-list
 
 commit:expression: $VAR(../prefix-list/) == ""; "you may only specify a prefix-list or access-list"
 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def
index c0da0baf..535c9cdd 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ip/address/prefix-list/node.def
@@ -2,9 +2,7 @@ type: txt
 help: IP prefix-list to match
 val_help: Prefix list name
 
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list/* )
-        echo -n ${params[@]##*/}
+allowed: cli-shell-api listActiveNodes policy prefix-list
 
 commit:expression: $VAR(../access-list/) == ""; "you may only specify a prefix-list or access-list"
 
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def
index 27bf95ce..64dfe74b 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/access-list/node.def
@@ -2,9 +2,7 @@ type: txt
 help: IPv6 access-list6 to match
 val_help: IPV6 access list name
 
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/access-list6/* )
-        echo -n ${params[@]##*/}
+allowed: cli-shell-api listActiveNodes policy access-list6
 
 commit:expression: $VAR(../prefix-list/) == ""; "you may only specify a prefix-list or access-list"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list6 $VAR(@)\" "; "access-list6 $VAR(@) does not exist"
diff --git a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def
index ef841e89..28d2e977 100644
--- a/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def
+++ b/templates/policy/route-map/node.tag/rule/node.tag/match/ipv6/address/prefix-list/node.def
@@ -2,9 +2,7 @@ type: txt
 help: IPv6 prefix-list to match
 val_help: IPv6 prefix list name
 
-allowed: local -a params
-        params=( /opt/vyatta/config/active/policy/prefix-list6/* )
-        echo -n ${params[@]##*/}
+allowed: cli-shell-api listActiveNodes policy prefix-list6
 
 commit:expression: $VAR(../access-list/) == ""; "you may only specify a prefix-list or access-list"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy prefix-list6 $VAR(@)\" "; "prefix-list6 $VAR(@) does not exist"