From 2cb713fbffd9b121e357431737b15332aad67f27 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Wed, 10 Feb 1999 09:35:26 +0000 Subject: [PATCH] use /sbin/dhclient-script rather than /etc/dhclient-script Obtained from: OpenBSD --- contrib/isc-dhcp/client/clparse.c | 2 +- contrib/isc-dhcp/client/dhclient.conf | 2 +- contrib/isc-dhcp/client/dhclient.conf.5 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/isc-dhcp/client/clparse.c b/contrib/isc-dhcp/client/clparse.c index 37fafd378f97..6a1f3b43a835 100644 --- a/contrib/isc-dhcp/client/clparse.c +++ b/contrib/isc-dhcp/client/clparse.c @@ -84,7 +84,7 @@ int read_client_conf () top_level_config.backoff_cutoff = 120; top_level_config.initial_interval = 10; top_level_config.bootp_policy = ACCEPT; - top_level_config.script_name = "/etc/dhclient-script"; + top_level_config.script_name = "/sbin/dhclient-script"; top_level_config.requested_options [top_level_config.requested_option_count++] = DHO_SUBNET_MASK; diff --git a/contrib/isc-dhcp/client/dhclient.conf b/contrib/isc-dhcp/client/dhclient.conf index 147e0045a5d8..bb7b8f7f9887 100644 --- a/contrib/isc-dhcp/client/dhclient.conf +++ b/contrib/isc-dhcp/client/dhclient.conf @@ -11,7 +11,7 @@ retry 60; reboot 10; select-timeout 5; initial-interval 2; -script "/etc/dhclient-script"; +script "/sbin/dhclient-script"; media "-link0 -link1 -link2", "link0 link1"; reject 192.33.137.209; diff --git a/contrib/isc-dhcp/client/dhclient.conf.5 b/contrib/isc-dhcp/client/dhclient.conf.5 index c5af648cf912..062a402ab342 100644 --- a/contrib/isc-dhcp/client/dhclient.conf.5 +++ b/contrib/isc-dhcp/client/dhclient.conf.5 @@ -518,7 +518,7 @@ interface "ep0" { request subnet-mask, broadcast-address, time-offset, routers, domain-name, domain-name-servers, host-name; require subnet-mask, domain-name-servers; - script "/etc/dhclient-script"; + script "/sbin/dhclient-script"; media "media 10baseT/UTP", "media 10base2/BNC"; }