diff options
author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:50:17 +0200 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:50:17 +0200 |
commit | bacecf80ea16d3cd30dc7c98c98af013b2adc258 (patch) | |
tree | 2b1d6f48708ace28ae4f6c9893ee50f6f390c6b7 /sysconf/filecaps | |
parent | 0d8e75e2e808ccf366a1527647a6353c09d92237 (diff) | |
parent | 0f19dc57ed6588c083eee8aa9aee09b92b441b08 (diff) | |
download | vyatta-cfg-system-lithium.tar.gz vyatta-cfg-system-lithium.zip |
Merge branch 'current' into lithiumlithium
Conflicts:
debian/changelog
scripts/snmp/vyatta-snmp-v3.pl
scripts/snmp/vyatta-snmp.pl
templates/interfaces/tunnel/node.def
templates/system/sysctl/custom/node.def
Diffstat (limited to 'sysconf/filecaps')
-rw-r--r-- | sysconf/filecaps | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sysconf/filecaps b/sysconf/filecaps index 98ada7a3..96eadff4 100644 --- a/sysconf/filecaps +++ b/sysconf/filecaps @@ -9,10 +9,9 @@ cap_net_admin=pe /sbin/xtables-multi cap_net_admin=pe /usr/sbin/ipset cap_net_admin=pe /usr/sbin/conntrack cap_net_admin=pe /usr/sbin/arp -cap_net_admin=pe /usr/sbin/brctl +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 @@ -20,8 +19,7 @@ cap_net_raw,cap_net_admin=eip /usr/bin/dumpcap cap_net_admin,cap_sys_admin=pe /sbin/sysctl # Module install -cap_sys_module=pe /sbin/modprobe -cap_sys_module=pe /sbin/rmmod +cap_sys_module=pe /bin/kmod # Set time cap_sys_time=pe /bin/date |