diff --git a/templates/lxc-dnsmasq-systemd-init.j2 b/templates/lxc-dnsmasq-systemd-init.j2 index 4ae2d9d7..3deb9e9a 100644 --- a/templates/lxc-dnsmasq-systemd-init.j2 +++ b/templates/lxc-dnsmasq-systemd-init.j2 @@ -13,7 +13,7 @@ User=root ExecStartPre=/usr/local/bin/lxc-system-manage iptables-create {% endif %} -ExecStartPre=-/usr/bin/killall -u lxc-dnsmasq --regexp "^dnsmasq" +ExecStartPre=-/usr/bin/pkill -u {{ lxc_net_dnsmasq_user }} "^dnsmasq" ExecStart=/usr/local/bin/lxc-system-manage dnsmasq-start diff --git a/vars/debian-host.yml b/vars/debian-host.yml index 7101e6a9..57f3165e 100644 --- a/vars/debian-host.yml +++ b/vars/debian-host.yml @@ -34,6 +34,7 @@ _lxc_hosts_distro_packages: - liblxc1 - lxc - lxc-dev + - procps - python-dev - python-lxc - python3-lxc diff --git a/vars/gentoo-host.yml b/vars/gentoo-host.yml index 89240e60..2accd71d 100644 --- a/vars/gentoo-host.yml +++ b/vars/gentoo-host.yml @@ -32,6 +32,7 @@ lxc_hosts_distro_packages: - dev-python/python3-lxc - app-arch/xz-utils - sys-apps/ethtool + - sys-process/procps # Package to remove from the host lxc_hosts_remove_distro_packages: diff --git a/vars/redhat-7-host.yml b/vars/redhat-7-host.yml index 8d562c55..99641374 100644 --- a/vars/redhat-7-host.yml +++ b/vars/redhat-7-host.yml @@ -30,6 +30,7 @@ _lxc_hosts_distro_packages: - lxc-libs - lxc-templates - policycoreutils-python + - procps - python2-lxc - unzip - xz diff --git a/vars/suse-host.yml b/vars/suse-host.yml index e0036305..11ffd94f 100644 --- a/vars/suse-host.yml +++ b/vars/suse-host.yml @@ -33,6 +33,7 @@ _lxc_hosts_distro_packages: - libseccomp2 - lxc - liblxc-devel + - procps - python-lxc-python2 - systemd-container - xz diff --git a/vars/ubuntu-16.04-host.yml b/vars/ubuntu-16.04-host.yml index 6a2dfe31..0008f0ce 100644 --- a/vars/ubuntu-16.04-host.yml +++ b/vars/ubuntu-16.04-host.yml @@ -37,6 +37,7 @@ _lxc_hosts_distro_packages: - lxc - lxc-dev - lxc-templates + - procps - python-dev - python-lxc - python3-lxc diff --git a/vars/ubuntu-18.04-host.yml b/vars/ubuntu-18.04-host.yml index 6cb8dda4..8bd094df 100644 --- a/vars/ubuntu-18.04-host.yml +++ b/vars/ubuntu-18.04-host.yml @@ -37,6 +37,7 @@ _lxc_hosts_distro_packages: - lxc - lxc-dev - lxc-templates + - procps - python-dev - python-lxc - python3-lxc