summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-02-20 22:29:52 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-02-20 22:29:52 +0000
commit84da0bf4754bdb695d2a984c2326992e52bba9e0 (patch)
treed4b33604cc4c7e5b92527e53e557add630f704a4
parente376d454bb70ed41bbc3eb0358d37fa30c94358d (diff)
downloadbusybox-w32-84da0bf4754bdb695d2a984c2326992e52bba9e0.tar.gz
busybox-w32-84da0bf4754bdb695d2a984c2326992e52bba9e0.tar.bz2
busybox-w32-84da0bf4754bdb695d2a984c2326992e52bba9e0.zip
udhcp: make paths configurable
syslogd: trivial build fix
-rw-r--r--networking/udhcp/Config.in19
-rw-r--r--networking/udhcp/common.h2
-rw-r--r--networking/udhcp/dhcpd.h2
-rw-r--r--sysklogd/syslogd.c1
4 files changed, 21 insertions, 3 deletions
diff --git a/networking/udhcp/Config.in b/networking/udhcp/Config.in
index ff0e4e2ae..bbc1220a5 100644
--- a/networking/udhcp/Config.in
+++ b/networking/udhcp/Config.in
@@ -42,6 +42,15 @@ config FEATURE_UDHCPD_WRITE_LEASES_EARLY
42 to send SIGUSR1 for the initial writing, or updating. Any timed 42 to send SIGUSR1 for the initial writing, or updating. Any timed
43 rewriting remains undisturbed 43 rewriting remains undisturbed
44 44
45config DHCPD_LEASES_FILE
46 string "Absolute path to lease file"
47 default "/var/lib/misc/udhcpd.leases"
48 depends on APP_UDHCPD
49 help
50 The udhcpd stores address in lease files. Normaly it is save
51 to leave it untouched.
52
53
45config APP_UDHCPC 54config APP_UDHCPC
46 bool "udhcp Client (udhcpc)" 55 bool "udhcp Client (udhcpc)"
47 default n 56 default n
@@ -90,6 +99,16 @@ config FEATURE_RFC3397
90 If selected, both client and server will support passing of domain 99 If selected, both client and server will support passing of domain
91 search lists via option 119, specified in RFC3397. 100 search lists via option 119, specified in RFC3397.
92 101
102config DHCPC_DEFAULT_SCRIPT
103 string "Absolute path to config script"
104 default "/usr/share/udhcpc/default.script"
105 depends on APP_UDHCPC
106 help
107 This script is called after udhcpc receives and answer. See
108 examples/udhcp for a working example. Normaly it is save
109 to leave this untouched.
110
111
93config UDHCPC_SLACK_FOR_BUGGY_SERVERS 112config UDHCPC_SLACK_FOR_BUGGY_SERVERS
94 int "DHCP options slack buffer size" 113 int "DHCP options slack buffer size"
95 default 80 114 default 80
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 9b26678c1..d44bca4e6 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -12,7 +12,7 @@
12 12
13#include "libbb.h" 13#include "libbb.h"
14 14
15#define DEFAULT_SCRIPT "/usr/share/udhcpc/default.script" 15#define DEFAULT_SCRIPT CONFIG_DHCPC_DEFAULT_SCRIPT
16 16
17extern const uint8_t MAC_BCAST_ADDR[6]; /* six all-ones */ 17extern const uint8_t MAC_BCAST_ADDR[6]; /* six all-ones */
18 18
diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h
index d97c8b8f7..0596e0620 100644
--- a/networking/udhcp/dhcpd.h
+++ b/networking/udhcp/dhcpd.h
@@ -10,7 +10,7 @@
10 10
11/* the period of time the client is allowed to use that address */ 11/* the period of time the client is allowed to use that address */
12#define LEASE_TIME (60*60*24*10) /* 10 days of seconds */ 12#define LEASE_TIME (60*60*24*10) /* 10 days of seconds */
13#define LEASES_FILE "/var/lib/misc/udhcpd.leases" 13#define LEASES_FILE CONFIG_DHCPD_LEASES_FILE
14 14
15/* where to find the DHCP server configuration file */ 15/* where to find the DHCP server configuration file */
16#define DHCPD_CONF_FILE "/etc/udhcpd.conf" 16#define DHCPD_CONF_FILE "/etc/udhcpd.conf"
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index bed18168c..0d98351fe 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -613,7 +613,6 @@ int syslogd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
613int syslogd_main(int argc, char **argv) 613int syslogd_main(int argc, char **argv)
614{ 614{
615 char OPTION_DECL; 615 char OPTION_DECL;
616 char *p;
617 616
618 INIT_G(); 617 INIT_G();
619#if ENABLE_FEATURE_REMOTE_LOG 618#if ENABLE_FEATURE_REMOTE_LOG