restore the dropped bits of 1c1bb85a and also implement the logic

suggested at https://lists.linuxcontainers.org/pipermail/lxc-devel/2014-December/010985.htmlSigned-off-by: S.Çağlar Onur <caglar@10ur.org> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

restore the dropped bits of 1c1bb85a and also implement the logic
5fdd4b0c · S.Çağlar Onur · Stéphane Graber · e6744e9b · 5fdd4b0c
Commit 5fdd4b0c authored Jan 17, 2015 by S.Çağlar Onur Committed by Stéphane Graber Jan 20, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

lxc-net.in config/init/common/lxc-net.in +9 -1

No files found.
--- a/config/init/common/lxc-net.in
+++ b/config/init/common/lxc-net.in
@@ -115,7 +115,15 @@ start() {
    if [ -n "$LXC_DOMAIN" ]; then
        LXC_DOMAIN_ARG="-s $LXC_DOMAIN -S /$LXC_DOMAIN/"
    fi
-    dnsmasq $LXC_DOMAIN_ARG -u lxc-dnsmasq --strict-order --bind-interfaces --pid-file="${varrun}"/dnsmasq.pid --conf-file=${LXC_DHCP_CONFILE} --listen-address ${LXC_ADDR} --dhcp-range ${LXC_DHCP_RANGE} --dhcp-lease-max=${LXC_DHCP_MAX} --dhcp-no-override --except-interface=lo --interface=${LXC_BRIDGE} --dhcp-leasefile=/var/lib/misc/dnsmasq.${LXC_BRIDGE}.leases --dhcp-authoritative || cleanup
+
+    # https://lists.linuxcontainers.org/pipermail/lxc-devel/2014-October/010561.html
+    for DNSMASQ_USER in lxc-dnsmasq dnsmasq nobody
+    do
+        if getent passwd ${DNSMASQ_USER} >/dev/null; then
+            break
+        fi
+    done
+    dnsmasq $LXC_DOMAIN_ARG -u ${DNSMASQ_USER} --strict-order --bind-interfaces --pid-file="${varrun}"/dnsmasq.pid --conf-file=${LXC_DHCP_CONFILE} --listen-address ${LXC_ADDR} --dhcp-range ${LXC_DHCP_RANGE} --dhcp-lease-max=${LXC_DHCP_MAX} --dhcp-no-override --except-interface=lo --interface=${LXC_BRIDGE} --dhcp-leasefile=/var/lib/misc/dnsmasq.${LXC_BRIDGE}.leases --dhcp-authoritative || cleanup
    touch "${varrun}"/network_up
    touch "${lockdir}"/lxc-net
 }