[oe] [PATCH] dhcp: Correct leases directory location

[Steve Sakoman]

On Wed, 2010-03-31 at 14:29 +0100, Martyn Welch wrote:
> The DHCP client currently expects to be able to create a leases file in
> "/var/lib/dhcp" as configured in dhcp3.inc. Recipe is currently creating a
> directory called "/var/lib/dhcp3", resulting in the following error:
>
> can't create /var/lib/dhcp/dhclient.eth0.leases
>
> Correct directory naming to resolve error.
>
> Signed-off-by: Martyn Welch <martyn.welch at ge.com>
>
> ---
>
>  Steve: This seems to be directy reversing a change you made. The commit
>   message doesn't give me any idea of why you did it, can you remember?

Interesting.  I made the change because I was getting quite similar
errors, but for files being created in /var/lib/dhcp3!

I'm not sure what is different about our overall set ups, but perhaps
the proper fix is to create both directories.

Steve


>  recipes/dhcp/dhcp3.inc |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/dhcp/dhcp3.inc b/recipes/dhcp/dhcp3.inc
> index f099003..5507f1c 100644
> --- a/recipes/dhcp/dhcp3.inc
> +++ b/recipes/dhcp/dhcp3.inc
> @@ -45,7 +45,7 @@ do_install() {
>       install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server
>       install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf
>       install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
> -     install -d ${D}/var/lib/dhcp3
> +     install -d ${D}/var/lib/dhcp
>  }
>
>  PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell"
> @@ -53,7 +53,7 @@ FILES_${PN} = ""
>  FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
>  FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
>
> -FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf /var/lib/dhcp3"
> +FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf /var/lib/dhcp"
>
>  FILES_dhcp-omshell = "${bindir}/omshell"
>
>
>
> --
> Martyn Welch (Principal Software Engineer)   |   Registered in England and
> GE Intelligent Platforms                     |   Wales (3828642) at 100
> T +44(0)127322748                            |   Barbirolli Square, Manchester,
> E martyn.welch at ge.com                        |   M2 3AB  VAT:GB 927559189