diff options
| author | Ron Yorston <rmy@pobox.com> | 2014-05-06 20:41:10 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2014-05-06 20:41:10 +0100 |
| commit | d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e (patch) | |
| tree | 4b364ba4b6b9e96c2629fe382fef0248d76833dd /networking/Config.src | |
| parent | 7905d97aeece18da362a5a1e066abff2d2e5c16b (diff) | |
| parent | d257608a8429b64e1a04c7cb6d99975eeb2c3955 (diff) | |
| download | busybox-w32-d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e.tar.gz busybox-w32-d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e.tar.bz2 busybox-w32-d3bef66324a8ca5eed9ad7c15ead3a1cc9a9151e.zip | |
Merge branch 'busybox' into merge
Conflicts:
debianutils/which.c
editors/vi.c
libbb/executable.c
Diffstat (limited to 'networking/Config.src')
| -rw-r--r-- | networking/Config.src | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/networking/Config.src b/networking/Config.src index ca0ddcdd9..fbad7ecb2 100644 --- a/networking/Config.src +++ b/networking/Config.src | |||
| @@ -664,6 +664,14 @@ config FEATURE_NTPD_SERVER | |||
| 664 | Make ntpd usable as a NTP server. If you disable this option | 664 | Make ntpd usable as a NTP server. If you disable this option |
| 665 | ntpd will be usable only as a NTP client. | 665 | ntpd will be usable only as a NTP client. |
| 666 | 666 | ||
| 667 | config FEATURE_NTPD_CONF | ||
| 668 | bool "Make ntpd understand /etc/ntp.conf" | ||
| 669 | default y | ||
| 670 | depends on NTPD | ||
| 671 | help | ||
| 672 | Make ntpd look in /etc/ntp.conf for peers. Only "server address" | ||
| 673 | is supported. | ||
| 674 | |||
| 667 | config PSCAN | 675 | config PSCAN |
| 668 | bool "pscan" | 676 | bool "pscan" |
| 669 | default y | 677 | default y |