summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorrbalocca <rbalocca@vyatta.com>2008-05-07 12:19:06 -0700
committerrbalocca <rbalocca@vyatta.com>2008-05-07 12:19:06 -0700
commit2f3d02eede9cd991179ffa5a3075a46f73e6bacf (patch)
tree1fcc7c2607c966140006f033e578be055735d3e8 /debian
parent87b0bf788ed149b9ba3dcf04c1e666c4e81abf93 (diff)
parenta3aa2f7e17e1cccfc9334a61547e48e156d5453b (diff)
downloadvyatta-cfg-system-2f3d02eede9cd991179ffa5a3075a46f73e6bacf.tar.gz
vyatta-cfg-system-2f3d02eede9cd991179ffa5a3075a46f73e6bacf.zip
Merge branch 'glendale' into hollywood
Conflicts: debian/vyatta-cfg-system.postinst.in
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog28
-rw-r--r--debian/vyatta-cfg-system.postinst.in6
2 files changed, 33 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 1e41734f..bd9e876e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+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
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