Merge branch 'glendale' of suva.vyatta.com:/git/vyatta-cfg into glendale

3 files changed, 21 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 01b2125..5f9affd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+vyatta-cfg (0.2) unstable; urgency=low
+
+  vc4.0.0
+  [ Mark O'Brien ]
+
+
+  [ An-Cheng Huang ]
+  * rewrite lexical analyzer to support simplified templates.
+  * add "official" support for "comp_help" and "allowed" in config
+    template
+  * allow non-indented line continuation
+  * skip spaces immediately after field names
+  * handle empty action
+  * * don't require backslash line-continuation in expressions.
+  * allow non-txt values in initial state (for default).
+
+ -- An-Cheng Huang <mobrien@vyatta.com>  Mon, 25 Feb 2008 17:38:45 -0800
+
 vyatta-cfg (0.1) unstable; urgency=low
 
   * Initial Release.
diff --git a/debian/control b/debian/control
index 1d04e20..c317ca4 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Depends: bash (>= 3.1),
  procps (>= 1:3.2.7-3),
  vyatta-quagga | quagga,
  coreutils (>= 5.97-5.3),
+ bsdutils,
  vyatta-op,
  vyatta-config-migrate, 
  dhcp3-client | vyatta-dhcp3-client
diff --git a/debian/vyatta-cfg.postinst.in b/debian/vyatta-cfg.postinst.in
index 556b1a9..074d57c 100644
--- a/debian/vyatta-cfg.postinst.in
+++ b/debian/vyatta-cfg.postinst.in
@@ -18,6 +18,6 @@ if [ "$sysconfdir" != "/etc" ]; then
   done
 fi
 
-# add group for configure
+# add group for configuration, if not already present:
+grep '^vyattacfg:' /etc/group >/dev/null ||
 addgroup --system vyattacfg
-