Merge pull request #3617 from motiejus/lxc-net-dnsmasq

make lxc-net's dnsmasq hermetic

Merge pull request #3617 from motiejus/lxc-net-dnsmasq
092529ea · Stéphane Graber · GitHub · 5e4dddcf · 60a43d55 · 092529ea
Unverified Commit 092529ea authored Jan 11, 2021 by Stéphane Graber Committed by GitHub Jan 11, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

lxc-net.in config/init/common/lxc-net.in +3 -4

No files found.
--- a/config/init/common/lxc-net.in
+++ b/config/init/common/lxc-net.in
@@ -115,10 +115,9 @@ start() {
        LXC_DOMAIN_ARG="-s $LXC_DOMAIN -S /$LXC_DOMAIN/"
    fi

-    LXC_DHCP_CONFILE_ARG=""
-    if [ -n "$LXC_DHCP_CONFILE" ]; then
-        LXC_DHCP_CONFILE_ARG="--conf-file=${LXC_DHCP_CONFILE}"
-    fi
+    # lxc's dnsmasq should be hermetic and not read `/etc/dnsmasq.conf` (which
+    # it does by default if `--conf-file` is not present
+    LXC_DHCP_CONFILE_ARG="--conf-file=${LXC_DHCP_CONFILE:-/dev/null}"

    # https://lists.linuxcontainers.org/pipermail/lxc-devel/2014-October/010561.html
    for DNSMASQ_USER in lxc-dnsmasq dnsmasq nobody