Re: [PATCH 2/2] dnsmasq: Add support for lxc-net, lxd-bridge, NetworkManager

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 11/07/2018 03:57 PM, Petr Vorel wrote:
* lxc-net pid and lease files:
/var/run/lxc/dnsmasq.pid
/var/lib/misc/dnsmasq.*.leases

* lxd-bridge pid and lease files:
/var/run/lxd-bridge/dnsmasq.pid
/var/lib/lxd-bridge/dnsmasq.*.leases
/var/lib/lxd/networks/*/dnsmasq.leases
/var/lib/lxd/networks/*/dnsmasq.pid

* NetworkManager pid, lease and configuration files:
/var/lib/NetworkManager/dnsmasq-*.leases
/run/nm-dns-dnsmasq.conf
/run/nm-dnsmasq-*.pid
/run/sendsigs.omit.d/*dnsmasq.pid
/run/NetworkManager/dnsmasq.conf
/run/NetworkManager/dnsmasq.pid

Signed-off-by: Petr Vorel <pvorel@xxxxxxx>
---
  policy/modules/services/dnsmasq.fc | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/policy/modules/services/dnsmasq.fc b/policy/modules/services/dnsmasq.fc
index 4c34df3c..d1fb367e 100644
--- a/policy/modules/services/dnsmasq.fc
+++ b/policy/modules/services/dnsmasq.fc
@@ -1,5 +1,7 @@
  /etc/dnsmasq\.conf	--	gen_context(system_u:object_r:dnsmasq_etc_t,s0)
  /etc/dnsmasq\.d(/.*)?   gen_context(system_u:object_r:dnsmasq_etc_t,s0)
+/run/nm-dns-dnsmasq.conf   gen_context(system_u:object_r:dnsmasq_etc_t,s0)
+/run/NetworkManager/dnsmasq.conf   gen_context(system_u:object_r:dnsmasq_etc_t,s0)

Unfortunately there already was some ordering problems in the file (I've since fixed them). These should go with the other /run lines. Also escape the \.conf.


  /etc/rc\.d/init\.d/dnsmasq	--	gen_context(system_u:object_r:dnsmasq_initrc_exec_t,s0)
@@ -10,10 +12,18 @@ /usr/sbin/dnsmasq -- gen_context(system_u:object_r:dnsmasq_exec_t,s0) -/var/lib/misc/dnsmasq\.leases -- gen_context(system_u:object_r:dnsmasq_lease_t,s0)
+/var/lib/misc/dnsmasq(\..+)?\.leases	--	gen_context(system_u:object_r:dnsmasq_lease_t,s0)
  /var/lib/dnsmasq(/.*)?	gen_context(system_u:object_r:dnsmasq_lease_t,s0)
+/var/lib/lxd-bridge/dnsmasq\..+\.leases	--	gen_context(system_u:object_r:dnsmasq_lease_t,s0)
+/var/lib/lxd/networks/\.*/dnsmasq\.leases	--	gen_context(system_u:object_r:dnsmasq_lease_t,s0)
+/var/lib/NetworkManager/dnsmasq-.*\.leases	--	gen_context(system_u:object_r:dnsmasq_lease_t,s0)
/var/log/dnsmasq(.*)?\.log -- gen_context(system_u:object_r:dnsmasq_var_log_t,s0) /run/dnsmasq.* -- gen_context(system_u:object_r:dnsmasq_var_run_t,s0)
  /run/libvirt/network(/.*)?	gen_context(system_u:object_r:dnsmasq_var_run_t,s0)
+/run/(lxc|lxd-bridge|NetworkManager)/dnsmasq.pid	--	gen_context(system_u:object_r:dnsmasq_var_run_t,s0)
+/var/lib/lxd/networks/\.+/dnsmasq.pid	--	gen_context(system_u:object_r:dnsmasq_var_run_t,s0)
+
+/run/nm-dnsmasq-.+.pid	--	gen_context(system_u:object_r:dnsmasq_var_run_t,s0)
+/run/sendsigs\.omit\.d/.*dnsmasq.pid	--	gen_context(system_u:object_r:dnsmasq_var_run_t,s0)

Same thing here with the line placement.



--
Chris PeBenito



[Index of Archives]     [AMD Graphics]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux