- Make sure all /etc/dhcp config files are marked in the manifest
- Include new config file directies in the dhcp and dhclient packages - Do not overwrite new config files if they already exist
This commit is contained in:
parent
13a0b57486
commit
f400f01eb3
@ -258,7 +258,7 @@ CFLAGS="%{optflags} -fPIC -D_GNU_SOURCE -DLDAP_CONFIGURATION -DUSE_SSL" \
|
|||||||
|
|
||||||
# Remove files we don't want
|
# Remove files we don't want
|
||||||
%{__rm} -f %{buildroot}%{_sysconfdir}/dhclient.conf
|
%{__rm} -f %{buildroot}%{_sysconfdir}/dhclient.conf
|
||||||
%{__rm} -f %{buildroot}%{_sysconfdir}/dhcp/dhclient.conf
|
%{__rm} -f %{buildroot}%{_sysconfdir}/dhcpd.conf
|
||||||
|
|
||||||
# Install correct dhclient-script
|
# Install correct dhclient-script
|
||||||
%{__mkdir} -p %{buildroot}/sbin
|
%{__mkdir} -p %{buildroot}/sbin
|
||||||
@ -294,6 +294,7 @@ EOF
|
|||||||
%{__cp} -p server/dhcpd.conf dhcpd.conf.sample
|
%{__cp} -p server/dhcpd.conf dhcpd.conf.sample
|
||||||
|
|
||||||
# Install default (empty) dhcpd.conf:
|
# Install default (empty) dhcpd.conf:
|
||||||
|
%{__mkdir} -p %{buildroot}%{_sysconfdir}/dhcp
|
||||||
%{__cat} << EOF > %{buildroot}%{_sysconfdir}/dhcp/dhcpd.conf
|
%{__cat} << EOF > %{buildroot}%{_sysconfdir}/dhcp/dhcpd.conf
|
||||||
#
|
#
|
||||||
# DHCP Server Configuration file.
|
# DHCP Server Configuration file.
|
||||||
|
Loading…
Reference in New Issue
Block a user