From 39c9d001edb3ccc553aff28bca90810119dad85e Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 30 May 2007 08:03:01 +0000
Subject: [PATCH] Clifford Wolf: 	Some hotfixes for the dhcp package

[2007053002145331347] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8506 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/dhcp/dhclientscr.patch | 11 +++++++++++
 package/base/dhcp/dhcp.conf         | 21 +++++++--------------
 package/base/dhcp/rocknet_dhcp.sh   |  6 ------
 3 files changed, 18 insertions(+), 20 deletions(-)
 create mode 100644 package/base/dhcp/dhclientscr.patch
 delete mode 100644 package/base/dhcp/rocknet_dhcp.sh

diff --git a/package/base/dhcp/dhclientscr.patch b/package/base/dhcp/dhclientscr.patch
new file mode 100644
index 000000000..f10cf4884
--- /dev/null
+++ b/package/base/dhcp/dhclientscr.patch
@@ -0,0 +1,11 @@
+--- ./client/scripts/linux	2007-05-30 01:50:45.000000000 +0200
++++ ./client/scripts/linux	2007-05-30 01:51:27.000000000 +0200
+@@ -4,6 +4,8 @@
+ # No guarantees about this. I'm a novice at the details of Linux
+ # networking.
+ 
++export PATH=/bin:/sbin:/usr/bin:/usr/sbin
++
+ # Notes:
+ 
+ # 0. This script is based on the netbsd script supplied with dhcp-970306.
diff --git a/package/base/dhcp/dhcp.conf b/package/base/dhcp/dhcp.conf
index 5020adec3..0a2d6b89d 100644
--- a/package/base/dhcp/dhcp.conf
+++ b/package/base/dhcp/dhcp.conf
@@ -20,14 +20,7 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-pre_dhcp() {
-	cat >> site.conf <<-EOP
-INCDIR=$root/$prefix/include
-LIBDIR=$root/$prefix/lib
-EOP
-}
-
-pm_dhcp() {
+postmake_dhcp() {
 	# install japanese manpages
 	mkdir -p $root/$prefix/share/man/ja_JP.eucjp/man5
 	mkdir -p $root/$prefix/share/man/ja_JP.eucjp/man8
@@ -37,13 +30,13 @@ pm_dhcp() {
 
 	cp -v doc/* client/dhclient.conf server/dhcpd.conf $docdir
 	install_init dhcp $confdir/dhcp.init
-	cp -v $confdir/rocknet_dhcp.sh \
-		$root/etc/network/modules/dhcp.sh
+
+	cp -v client/scripts/linux $root/etc/dhclient-script
+	chmod +x $root/etc/dhclient-script
 }
 
-confopt=""
-var_append makeopt ' ' 'CC_OPTIONS="-DPARANOIA -DEARLY_CHROOT"'
+postmake="postmake_dhcp"
 
-preconf="pre_dhcp"
-postmake="pm_dhcp"
+var_append extraconfopt " " "--with-srv-lease-file=/var/state/dhcpd.leases"
+var_append extraconfopt " " "--with-cli-lease-file=/var/state/dhclient.leases"
 
diff --git a/package/base/dhcp/rocknet_dhcp.sh b/package/base/dhcp/rocknet_dhcp.sh
deleted file mode 100644
index 13c7264eb..000000000
--- a/package/base/dhcp/rocknet_dhcp.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-
-public_dhcp() {
-	addcode up   5 5 "/sbin/dhclient -q $if"
-	addcode down 5 5 "/sbin/dhclient -r $if"
-}
-