From e2a674ea06277c66a134650169085192a27ddade Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Thu, 19 Feb 2015 15:35:56 +0200 Subject: [PATCH] dhcp: Changed dhcpd to run in chroot on CentOS/RedHat 6. --- dhcp/manifests/init.pp | 4 ++-- dhcp/templates/dhcpd.sysconfig | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 dhcp/templates/dhcpd.sysconfig diff --git a/dhcp/manifests/init.pp b/dhcp/manifests/init.pp index 8379fca..3d4cd11 100644 --- a/dhcp/manifests/init.pp +++ b/dhcp/manifests/init.pp @@ -82,10 +82,10 @@ class dhcp::server::common { if $dhcp_server_interface { case $::operatingsystem { - "fedora","centos","redhat": { + "centos","redhat": { file { "/etc/sysconfig/dhcpd": ensure => present, - content => "DHCPDARGS=${dhcp_server_interface}\n", + content => template("dhcp/dhcpd.sysconfig"), mode => "0644", owner => "root", group => "root", diff --git a/dhcp/templates/dhcpd.sysconfig b/dhcp/templates/dhcpd.sysconfig new file mode 100644 index 0000000..f253de2 --- /dev/null +++ b/dhcp/templates/dhcpd.sysconfig @@ -0,0 +1,6 @@ +<% if @operatingsystemrelease =~ /^6\./ -%> +DHCPDARGS="-chroot ${statedir} -lf /dhcpd.leases -pf /dhcpd.pid <%= @dhcp_server_interface %>" +pidfile="${statedir}/dhcpd.pid" +<% else -%> +DHCPDARGS="<%= @dhcp_server_interface %>" +<% end -%>