diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-10-17 17:07:55 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-10-17 17:07:55 -0700 |
| commit | 964ad5ed90f9c6ec3f49d69e61b82575f0cf7fb3 (patch) | |
| tree | 0da4206dd43b04c5017810365618c1ec05341a85 | |
| parent | 8efee1861e892e2d6c279a4eb833f86aff542b53 (diff) | |
| parent | d1f64e253ba4049d5950adcf1e7e94d25078cca6 (diff) | |
| download | vyatta-cfg-system-964ad5ed90f9c6ec3f49d69e61b82575f0cf7fb3.tar.gz vyatta-cfg-system-964ad5ed90f9c6ec3f49d69e61b82575f0cf7fb3.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into changes-john-southworth
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | sysconf/filecaps | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index e56c740d..cbe17504 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.19.123) unstable; urgency=low + + * allow rmmod without being root (with capability) + + -- Stephen Hemminger <shemminger@vyatta.com> Mon, 17 Oct 2011 10:36:57 -0700 + vyatta-cfg-system (0.19.122) unstable; urgency=low * Bugfix 7551: Fix vlan address completion text diff --git a/sysconf/filecaps b/sysconf/filecaps index 163989b2..904b0938 100644 --- a/sysconf/filecaps +++ b/sysconf/filecaps @@ -16,10 +16,11 @@ cap_net_raw=pe /usr/bin/tshark cap_net_raw=pe /usr/sbin/tcpdump # Allow changes to system settings -cap_sys_admin=pe /sbin/sysctl +cap_net_admin,cap_sys_admin=pe /sbin/sysctl # Module install cap_sys_module=pe /sbin/modprobe +cap_sys_module=pe /sbin/rmmod # Set time cap_sys_time=pe /bin/date |