diff options
author | rbalocca <rbalocca@vyatta.com> | 2008-05-21 16:06:11 -0700 |
---|---|---|
committer | rbalocca <rbalocca@vyatta.com> | 2008-05-21 16:06:11 -0700 |
commit | eafedd1e4106562073de4d20d567496903a9a443 (patch) | |
tree | 5319c720b6752c1f5d58b97e8ca923f8901ce816 /debian | |
parent | 24802bd1a1ec56812001e92ad158bc2f08bb1ee6 (diff) | |
parent | a3aa2f7e17e1cccfc9334a61547e48e156d5453b (diff) | |
download | vyatta-cfg-system-glendale.tar.gz vyatta-cfg-system-glendale.zip |
Merge branch 'glendale'glendale
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 44 | ||||
-rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 6 |
2 files changed, 49 insertions, 1 deletions
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 30cbfd5a..17d1264d 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 +### END VYATTA OPERATOR COMMANDS EOF + fi # for "users" level (FIXME) if ! grep -q "^%users ALL=NOPASSWD: ${bindir}/sudo-users/" /etc/sudoers; then |