This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 789e6f5c8ebf3eacebf40d56f0b972df851e9d40 (commit) via 1cded5eefd1516f5e35f16086b4fde737907e20f (commit) from 00f9fa160d2089ddb5ed09ec7dcec35af94f76bc (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 789e6f5c8ebf3eacebf40d56f0b972df851e9d40 Merge: 1cded5e 00f9fa1 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 21 14:06:57 2012 +0200

Merge branch 'next' of ssh://git.ipfire.org/srv/git/ipfire-2.x into next

commit 1cded5eefd1516f5e35f16086b4fde737907e20f Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 21 14:06:37 2012 +0200

dhcp: Fix installation of configuration files.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/dhcp | 5 +++-- lfs/dhcp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp index c2f5aed..381309c 100644 --- a/config/rootfiles/common/dhcp +++ b/config/rootfiles/common/dhcp @@ -1,5 +1,6 @@ -#etc/dhclient.conf -etc/dhcpd.conf +#etc/dhcp +#etc/dhcp/dhclient.conf +etc/dhcp/dhcpd.conf #usr/bin/omshell #usr/include/dhcpctl #usr/include/dhcpctl/dhcpctl.h diff --git a/lfs/dhcp b/lfs/dhcp index fa26b5c..816a75d 100644 --- a/lfs/dhcp +++ b/lfs/dhcp @@ -111,7 +111,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && \ ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/dhcp \ --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \ --disable-static \ --enable-paranoia \ @@ -123,6 +123,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) mkdir -pv /var/state/dhcp touch /var/state/dhcp/dhcpd.leases

- ln -sf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcpd.conf + ln -svf $(CONFIG_ROOT)/dhcp/dhcpd.conf /etc/dhcp/dhcpd.conf @rm -rf $(DIR_APP) @$(POSTBUILD)

hooks/post-receive -- IPFire 2.x development tree