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

3 files changed, 49 insertions, 27 deletions

diff --git a/debian/autogen.sh b/debian/autogen.sh
index ff125d1d..e8c94af8 100755
--- a/debian/autogen.sh
+++ b/debian/autogen.sh
@@ -1,32 +1,6 @@
 #!/bin/sh
 
 
-if [ -d .git ] ; then
-# generate GNU/Debian format ChangeLog from git log
-
-    rm -f ChangeLog
-
-    if which git2cl >/dev/null ; then
-	git-log --pretty --numstat --summary | git2cl >> ChangeLog
-    else
-	git-log --pretty=short >> ChangeLog
-    fi
-
-# append repository reference
-
-    url=` git repo-config --get remote.origin.url`
-    test "x$url" = "x" && url=`pwd`
-
-    branch=`git-branch --no-color | sed '/^\* /!d; s/^\* //'`
-    test "x$branch" = "x" && branch=master
-
-    sha=`git log --pretty=oneline --no-color -n 1 | cut -c-8`
-    test "x$sha" = "x" && sha=00000000
-
-    echo "$url#$branch-$sha" >> ChangeLog
-
-fi
-
 rm -rf config
 rm -f aclocal.m4 config.guess config.statusconfig.sub configure INSTALL
 
diff --git a/debian/changelog b/debian/changelog
index 263a6f69..bd9e876e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+vyatta-cfg-system (0.9) unstable; urgency=low
+
+  3.0.5
+
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Tue, 06 May 2008 12:43:15 -0700
+
+vyatta-cfg-system (0.8) unstable; urgency=low
+
+  3.0.4
+  [ Mark O'Brien ]
+
+
+  [ An-Cheng Huang ]
+  * fix for bug 3225: only insert sudoers if not present.
+
+  [ Stig Thormodsrud ]
+  * Mimic the transaction mechanism to only restart the vrrp daemon
+    once/commit.
+
+  [ rbalocca ]
+  * config.boot.default is not moved to the top level repo (build-
+    iso.git)
+
+  [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Mon, 05 May 2008 16:40:35 -0700
+
+vyatta-cfg-system (0.7) unstable; urgency=low
+
+  3.0.3
+  [ Mark O'Brien ]
+
+
+  [ Stephen Hemminger ]
+  * watchlink is no longer used
+
+  [ rbalocca ]
+  * Indicate the VC4.0.2 release candidate in the changelog
+
+  [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Tue, 29 Apr 2008 16:42:17 -0700
+
 vyatta-cfg-system (0.6) unstable; urgency=low
 
   VC4.0.2
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 54931692..a627c4af 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -30,7 +30,9 @@ if [ "$sysconfdir" != "/etc" ]; then
     fi
 
     # Allow operator to do a limited number of commands without password
-    cat <<"EOF" >>/etc/sudoers
+    if ! grep -q '^%operator ALL=NOPASSWD:' /etc/sudoers; then
+        cat <<"EOF" >>/etc/sudoers
+### BEGIN VYATTA OPERATOR COMMANDS
 Cmnd_Alias IPTABLES = /sbin/iptables --list -n,\
 		      /sbin/iptables -L -vn,\
                       /sbin/iptables -L * -vn,\
@@ -46,7 +48,9 @@ Cmnd_Alias DATE    = /bin/date, /usr/sbin/ntpdate
 Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff
 %operator ALL=NOPASSWD: /sbin/reboot, DATE, IPTABLES, ETHTOOLP, IPFLUSH, \
 			PPPOE_CMDS, /usr/bin/tshark
+### END VYATTA OPERATOR COMMANDS
 EOF
+    fi
 
     # for "users" level (FIXME)
     if ! grep -q "^%users ALL=NOPASSWD: ${bindir}/sudo-users/" /etc/sudoers; then