summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--sysconf/filecaps3
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