summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-05-14 23:42:01 +0200
committerDaniil Baturin <daniil@baturin.org>2018-05-14 23:42:01 +0200
commit413d89862ad9bea7d31200eb7a29bd0dd7fca214 (patch)
tree08a19d2ceac26970f6ebaede6c4f6c4b9e23a972
parent58bcf1639e1656643e3470e25fbbea0a707355a9 (diff)
downloadvyatta-cfg-system-413d89862ad9bea7d31200eb7a29bd0dd7fca214.tar.gz
vyatta-cfg-system-413d89862ad9bea7d31200eb7a29bd0dd7fca214.zip
T637: remove dependency on tshark.
-rw-r--r--debian/control1
-rw-r--r--sysconf/filecaps1
-rw-r--r--sysconf/sudoers2
3 files changed, 1 insertions, 3 deletions
diff --git a/debian/control b/debian/control
index 1b6d08a6..1fff96c0 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,6 @@ Depends: adduser,
openssh-server,
ed,
ifupdown,
- tshark,
iputils-arping,
installation-report,
laptop-detect,
diff --git a/sysconf/filecaps b/sysconf/filecaps
index 85e83668..96eadff4 100644
--- a/sysconf/filecaps
+++ b/sysconf/filecaps
@@ -12,7 +12,6 @@ cap_net_admin=pe /usr/sbin/arp
cap_net_admin=pe /sbin/brctl
# Raw sockets
-cap_net_raw=pe /usr/bin/tshark
cap_net_raw=pe /usr/sbin/tcpdump
cap_net_raw,cap_net_admin=eip /usr/bin/dumpcap
diff --git a/sysconf/sudoers b/sysconf/sudoers
index b6c50423..998e7083 100644
--- a/sysconf/sudoers
+++ b/sysconf/sudoers
@@ -36,7 +36,7 @@ Cmnd_Alias DMIDECODE = /usr/sbin/dmidecode
Cmnd_Alias DISK = /usr/bin/lsof, /sbin/fdisk -l *, /sbin/sfdisk -d *
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 PCAPTURE = /usr/bin/tcpdump
Cmnd_Alias HWINFO = /usr/bin/lspci
Cmnd_Alias FORCE_CLUSTER = /usr/share/heartbeat/hb_takeover, \
/usr/share/heartbeat/hb_standby