diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-09-17 13:21:43 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-09-17 13:21:43 +0000 |
| commit | c93438a10548a09925bca85cb85136c0ae0d0a4d (patch) | |
| tree | 06247e3891aee82894b1a094b875b1d1492e97a6 /usr.sbin | |
| parent | 3f35108eca00cc61b079e31b8cb544240764837b (diff) | |
move dhclient-script to /usr/bin by default; executables do not belong in /etc
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/dhcp/dhclient/clparse.c | 4 | ||||
| -rw-r--r-- | usr.sbin/dhcp/dhclient/dhclient.conf | 2 | ||||
| -rw-r--r-- | usr.sbin/dhcp/dhclient/dhclient.conf.5 | 2 | ||||
| -rw-r--r-- | usr.sbin/dhcp/dhclient/scripts/Makefile | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/dhcp/dhclient/clparse.c b/usr.sbin/dhcp/dhclient/clparse.c index b90570799f6..2d1e689ae80 100644 --- a/usr.sbin/dhcp/dhclient/clparse.c +++ b/usr.sbin/dhcp/dhclient/clparse.c @@ -42,7 +42,7 @@ #ifndef lint static char copyright[] = -"$Id: clparse.c,v 1.1 1998/09/12 08:55:13 deraadt Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n"; +"$Id: clparse.c,v 1.2 1998/09/17 13:21:41 deraadt Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -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 = "/usr/bin/dhclient-script"; top_level_config.requested_options [top_level_config.requested_option_count++] = DHO_SUBNET_MASK; diff --git a/usr.sbin/dhcp/dhclient/dhclient.conf b/usr.sbin/dhcp/dhclient/dhclient.conf index 147e0045a5d..7927dbbcbee 100644 --- a/usr.sbin/dhcp/dhclient/dhclient.conf +++ b/usr.sbin/dhcp/dhclient/dhclient.conf @@ -11,7 +11,7 @@ retry 60; reboot 10; select-timeout 5; initial-interval 2; -script "/etc/dhclient-script"; +script "/usr/bin/dhclient-script"; media "-link0 -link1 -link2", "link0 link1"; reject 192.33.137.209; diff --git a/usr.sbin/dhcp/dhclient/dhclient.conf.5 b/usr.sbin/dhcp/dhclient/dhclient.conf.5 index c5af648cf91..e21735d1cd2 100644 --- a/usr.sbin/dhcp/dhclient/dhclient.conf.5 +++ b/usr.sbin/dhcp/dhclient/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 "/usr/bin/dhclient-script"; media "media 10baseT/UTP", "media 10base2/BNC"; } diff --git a/usr.sbin/dhcp/dhclient/scripts/Makefile b/usr.sbin/dhcp/dhclient/scripts/Makefile index 16c81ed9c09..ee77ab88415 100644 --- a/usr.sbin/dhcp/dhclient/scripts/Makefile +++ b/usr.sbin/dhcp/dhclient/scripts/Makefile @@ -34,6 +34,6 @@ NOMAN= beforeinstall: ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/dhclient-script ${DESTDIR}/etc/dhclient-script + ${.CURDIR}/dhclient-script ${DESTDIR}/usr/bin/dhclient-script .include <bsd.prog.mk> |