diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-08-01 12:50:22 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-08-01 12:50:22 -0500 |
| commit | 5a50034c30bf284bcf3cec10dd6c5d14b93e334d (patch) | |
| tree | 3f9cff546e0e3ca74c9a03e25e02440bbb5da874 | |
| parent | ab6d0b035f0dbf192496dc151c2d3db395dbbc7a (diff) | |
| parent | 5c9468830faaad8976bf9739d250363aef171f40 (diff) | |
| download | vyatta-cfg-system-5a50034c30bf284bcf3cec10dd6c5d14b93e334d.tar.gz vyatta-cfg-system-5a50034c30bf284bcf3cec10dd6c5d14b93e334d.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into oxnard
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 84272269..a7b07c9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.19.106) unstable; urgency=low + + * Added to make "force" op-mode command accessible to user type + + -- Deepti Kulkarni <deepti@vyatta.com> Wed, 27 Jul 2011 08:00:09 -0700 + vyatta-cfg-system (0.19.105) unstable; urgency=low * Bugfix 7350: Allow default config.boot to be selected as config diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 4e07288d..0eb74858 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -111,9 +111,11 @@ Cmnd_Alias DATE = /bin/date, /usr/sbin/ntpdate Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff, /usr/sbin/pppstats Cmnd_Alias PCAPTURE = /usr/bin/tshark, /usr/bin/tcpdump Cmnd_Alias HWINFO = /usr/bin/lspci +Cmnd_Alias FORCE_CLUSTER = /usr/share/heartbeat/hb_takeover, \ + /usr/share/heartbeat/hb_standby %operator ALL=NOPASSWD: DATE, IPTABLES, ETHTOOL, IPFLUSH, HWINFO, \ PPPOE_CMDS, PCAPTURE, /usr/sbin/wanpipemon, \ - DISK, CONNTRACK, IP6TABLES + DISK, CONNTRACK, IP6TABLES, FORCE_CLUSTER EOF cat <<EOF >>/etc/sudoers %users ALL=NOPASSWD: ${bindir}/sudo-users/ |