diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 13:15:08 +0000 |
| commit | c0d4367d6b581eb5989c02815880cf0fa2851ae8 (patch) | |
| tree | 868c266e627e2d7f65ba5a4d5f98a1c421453181 /miscutils/Config.src | |
| parent | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (diff) | |
| parent | da4441c44f6efccb6f7b7588404d9c6bfb7b6af8 (diff) | |
| download | busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.gz busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.tar.bz2 busybox-w32-c0d4367d6b581eb5989c02815880cf0fa2851ae8.zip | |
Merge commit 'da4441c44f6efccb6f7b7588404d9c6bfb7b6af8' into merge
Conflicts:
libbb/vfork_daemon_rexec.c
networking/wget.c
procps/ps.c
Diffstat (limited to 'miscutils/Config.src')
| -rw-r--r-- | miscutils/Config.src | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/miscutils/Config.src b/miscutils/Config.src index da52e14c6..b5866bbd7 100644 --- a/miscutils/Config.src +++ b/miscutils/Config.src | |||
| @@ -583,6 +583,7 @@ config RFKILL | |||
| 583 | config RUNLEVEL | 583 | config RUNLEVEL |
| 584 | bool "runlevel" | 584 | bool "runlevel" |
| 585 | default y | 585 | default y |
| 586 | depends on FEATURE_UTMP | ||
| 586 | help | 587 | help |
| 587 | find the current and previous system runlevel. | 588 | find the current and previous system runlevel. |
| 588 | 589 | ||
| @@ -658,6 +659,7 @@ config VOLNAME | |||
| 658 | config WALL | 659 | config WALL |
| 659 | bool "wall" | 660 | bool "wall" |
| 660 | default y | 661 | default y |
| 662 | depends on FEATURE_UTMP | ||
| 661 | help | 663 | help |
| 662 | Write a message to all users that are logged in. | 664 | Write a message to all users that are logged in. |
| 663 | 665 | ||