diff options
| author | gordon <gordon@FreeBSD.org> | 2003-06-29 18:46:18 +0000 |
|---|---|---|
| committer | gordon <gordon@FreeBSD.org> | 2003-06-29 18:46:18 +0000 |
| commit | 6b7019d5ed2baad877e25d3e76a4ebcfd3160c88 (patch) | |
| tree | 678d9e132073a3aaa1eac91dbcb82922f5f227c2 /contrib/isc-dhcp | |
| parent | 9beb6458f555f771d27552db74510cbe89a6ea38 (diff) | |
| download | FreeBSD-src-6b7019d5ed2baad877e25d3e76a4ebcfd3160c88.zip FreeBSD-src-6b7019d5ed2baad877e25d3e76a4ebcfd3160c88.tar.gz | |
Tweak a couple of utilities so they compile cleanly for /rescue. Mostly
path fixes.
Submitted by: Tim Kientzle <kientzle@acm.org>
Diffstat (limited to 'contrib/isc-dhcp')
| -rw-r--r-- | contrib/isc-dhcp/includes/cf/freebsd.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/contrib/isc-dhcp/includes/cf/freebsd.h b/contrib/isc-dhcp/includes/cf/freebsd.h index eefbce3..db15c30 100644 --- a/contrib/isc-dhcp/includes/cf/freebsd.h +++ b/contrib/isc-dhcp/includes/cf/freebsd.h @@ -103,6 +103,10 @@ extern int h_errno; #define SOCKLEN_T int #endif +#ifdef RESCUE +#define _PATH_DHCLIENT_SCRIPT "/rescue/dhclient-script" +#endif + #if defined (USE_DEFAULT_NETWORK) # define USE_BPF #endif @@ -113,6 +117,9 @@ extern int h_errno; #endif /* HAVE_DEV_RANDOM */ const char *cmds[] = { +#ifndef RESCUE + /* rescue environment can't rely on these ... */ + /* Actually, /sbin/dhclient shouldn't use these, either. */ "/bin/ps -axlw 2>&1", "/usr/sbin/arp -an 2>&1", "/usr/bin/netstat -an 2>&1", @@ -123,10 +130,12 @@ const char *cmds[] = { "/usr/sbin/iostat 2>&1", "/usr/bin/vmstat 2>&1", "/usr/bin/w 2>&1", +#endif NULL }; const char *dirs[] = { +#ifndef RESCUE "/tmp", "/usr/tmp", ".", @@ -136,13 +145,16 @@ const char *dirs[] = { "/var/mail", "/home", "/usr/home", +#endif NULL }; const char *files[] = { +#ifndef RESCUE "/var/log/messages", "/var/log/wtmp", "/var/log/lastlog", +#endif NULL }; #endif /* NEED_PRAND_CONF */ |
