diff options
| -rw-r--r-- | distrib/i386/floppies/ramdisk/list | 4 | ||||
| -rw-r--r-- | distrib/sets/lists/base/mi | 2 | ||||
| -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 |
6 files changed, 8 insertions, 8 deletions
diff --git a/distrib/i386/floppies/ramdisk/list b/distrib/i386/floppies/ramdisk/list index fc2691c1b7c..d943cb01b5c 100644 --- a/distrib/i386/floppies/ramdisk/list +++ b/distrib/i386/floppies/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.16 1998/09/15 21:54:44 deraadt Exp $ +# $OpenBSD: list,v 1.17 1998/09/17 15:31:16 deraadt Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/instbin instbin @@ -81,7 +81,7 @@ SYMLINK /tmp/hosts etc/hosts # dhcp things COPY ${DESTDIR}/etc/dhclient.conf etc/dhclient.conf -COPY ${DESTDIR}/etc/dhclient-script etc/dhclient-script +COPY ${DESTDIR}/sbin/dhclient-script sbin/dhclient-script # and the common installation tools COPY ${CURDIR}/termcap.pcvt usr/share/misc/termcap diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 470740a108f..982be7b1346 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -59,6 +59,7 @@ ./sbin/ccdconfig ./sbin/clri ./sbin/dhclient +./sbin/dhclient-script ./sbin/disklabel ./sbin/dmesg ./sbin/dump @@ -178,7 +179,6 @@ ./usr/bin/cvs ./usr/bin/cvsbug ./usr/bin/dc -./usr/bin/dhclient-script ./usr/bin/diff ./usr/bin/diff3 ./usr/bin/dirname diff --git a/usr.sbin/dhcp/dhclient/clparse.c b/usr.sbin/dhcp/dhclient/clparse.c index 2d1e689ae80..ed0dbd7f9cc 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.2 1998/09/17 13:21:41 deraadt Exp $ Copyright (c) 1997 The Internet Software Consortium. All rights reserved.\n"; +"$Id: clparse.c,v 1.3 1998/09/17 15:31:15 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 = "/usr/bin/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/usr.sbin/dhcp/dhclient/dhclient.conf b/usr.sbin/dhcp/dhclient/dhclient.conf index 7927dbbcbee..bb7b8f7f988 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 "/usr/bin/dhclient-script"; +script "/sbin/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 e21735d1cd2..062a402ab34 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 "/usr/bin/dhclient-script"; + script "/sbin/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 ee77ab88415..8aa7e33054b 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}/usr/bin/dhclient-script + ${.CURDIR}/dhclient-script ${DESTDIR}/sbin/dhclient-script .include <bsd.prog.mk> |