diff options
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/config/Config.in | 196 | ||||
| -rw-r--r-- | package/busybox/config/init/Config.in | 21 |
2 files changed, 109 insertions, 108 deletions
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in index 91cf58e81..b41788be0 100644 --- a/package/busybox/config/Config.in +++ b/package/busybox/config/Config.in @@ -131,17 +131,17 @@ config BUSYBOX_FEATURE_DEVPTS /dev/ttyp<number> will be used. To use this option, you should have devpts mounted. -config BUSYBOX_FEATURE_CLEAN_UP - bool "Clean up all memory before exiting (usually not needed)" - default n - help - As a size optimization, busybox normally exits without explicitly - freeing dynamically allocated memory or closing files. This saves - space since the OS will clean up for us, but it can confuse debuggers - like valgrind, which report tons of memory and resource leaks. - - Don't enable this unless you have a really good reason to clean - things up manually. +#config BUSYBOX_FEATURE_CLEAN_UP +# bool "Clean up all memory before exiting (usually not needed)" +# default n +# help +# As a size optimization, busybox normally exits without explicitly +# freeing dynamically allocated memory or closing files. This saves +# space since the OS will clean up for us, but it can confuse debuggers +# like valgrind, which report tons of memory and resource leaks. +# +# Don't enable this unless you have a really good reason to clean +# things up manually. config BUSYBOX_FEATURE_PIDFILE bool "Support writing pidfiles" @@ -167,47 +167,47 @@ config BUSYBOX_FEATURE_SUID crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su, traceroute, vlock. -config BUSYBOX_FEATURE_SUID_CONFIG - bool "Runtime SUID/SGID configuration via /etc/busybox.conf" - default n if FEATURE_SUID - depends on BUSYBOX_FEATURE_SUID - help - Allow the SUID / SGID state of an applet to be determined at runtime - by checking /etc/busybox.conf. (This is sort of a poor man's sudo.) - The format of this file is as follows: - - <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>) - - An example might help: - - [SUID] - su = ssx root.0 # applet su can be run by anyone and runs with - # euid=0/egid=0 - su = ssx # exactly the same - - mount = sx- root.disk # applet mount can be run by root and members - # of group disk and runs with euid=0 - - cp = --- # disable applet cp for everyone - - The file has to be owned by user root, group root and has to be - writeable only by root: - (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf) - The busybox executable has to be owned by user root, group - root and has to be setuid root for this to work: - (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox) - - Robert 'sandman' Griebl has more information here: - <url: http://www.softforge.de/bb/suid.html >. +#config BUSYBOX_FEATURE_SUID_CONFIG +# bool "Runtime SUID/SGID configuration via /etc/busybox.conf" +# default n if FEATURE_SUID +# depends on BUSYBOX_FEATURE_SUID +# help +# Allow the SUID / SGID state of an applet to be determined at runtime +# by checking /etc/busybox.conf. (This is sort of a poor man's sudo.) +# The format of this file is as follows: +# +# <applet> = [Ssx-][Ssx-][x-] (<username>|<uid>).(<groupname>|<gid>) +# +# An example might help: +# +# [SUID] +# su = ssx root.0 # applet su can be run by anyone and runs with +# # euid=0/egid=0 +# su = ssx # exactly the same +# +# mount = sx- root.disk # applet mount can be run by root and members +# # of group disk and runs with euid=0 +# +# cp = --- # disable applet cp for everyone +# +# The file has to be owned by user root, group root and has to be +# writeable only by root: +# (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf) +# The busybox executable has to be owned by user root, group +# root and has to be setuid root for this to work: +# (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox) +# +# Robert 'sandman' Griebl has more information here: +# <url: http://www.softforge.de/bb/suid.html >. -config BUSYBOX_FEATURE_SUID_CONFIG_QUIET - bool "Suppress warning message if /etc/busybox.conf is not readable" - default y - depends on BUSYBOX_FEATURE_SUID_CONFIG - help - /etc/busybox.conf should be readable by the user needing the SUID, - check this option to avoid users to be notified about missing - permissions. +#config BUSYBOX_FEATURE_SUID_CONFIG_QUIET +# bool "Suppress warning message if /etc/busybox.conf is not readable" +# default y +# depends on BUSYBOX_FEATURE_SUID_CONFIG +# help +# /etc/busybox.conf should be readable by the user needing the SUID, +# check this option to avoid users to be notified about missing +# permissions. #config BUSYBOX_SELINUX # bool "Support NSA Security Enhanced Linux" @@ -229,29 +229,29 @@ config BUSYBOX_FEATURE_SUID_CONFIG_QUIET # # Most people will leave this set to 'N'. -config BUSYBOX_FEATURE_PREFER_APPLETS - bool "exec prefers applets" - default n - help - This is an experimental option which directs applets about to - call 'exec' to try and find an applicable busybox applet before - searching the PATH. This is typically done by exec'ing - /proc/self/exe. - This may affect shell, find -exec, xargs and similar applets. - They will use applets even if /bin/<applet> -> busybox link - is missing (or is not a link to busybox). However, this causes - problems in chroot jails without mounted /proc and with ps/top - (command name can be shown as 'exe' for applets started this way). - -config BUSYBOX_BUSYBOX_EXEC_PATH - string "Path to BusyBox executable" - default "/proc/self/exe" - help - When Busybox applets need to run other busybox applets, BusyBox - sometimes needs to exec() itself. When the /proc filesystem is - mounted, /proc/self/exe always points to the currently running - executable. If you haven't got /proc, set this to wherever you - want to run BusyBox from. +#config BUSYBOX_FEATURE_PREFER_APPLETS +## bool "exec prefers applets" +# default n +# help +# This is an experimental option which directs applets about to +# call 'exec' to try and find an applicable busybox applet before +# searching the PATH. This is typically done by exec'ing +# /proc/self/exe. +# This may affect shell, find -exec, xargs and similar applets. +# They will use applets even if /bin/<applet> -> busybox link +# is missing (or is not a link to busybox). However, this causes +# problems in chroot jails without mounted /proc and with ps/top +# (command name can be shown as 'exe' for applets started this way). + +#config BUSYBOX_BUSYBOX_EXEC_PATH +# string "Path to BusyBox executable" +# default "/proc/self/exe" +# help +# When Busybox applets need to run other busybox applets, BusyBox +# sometimes needs to exec() itself. When the /proc filesystem is +# mounted, /proc/self/exe always points to the currently running +# executable. If you haven't got /proc, set this to wherever you +# want to run BusyBox from. # These are auto-selected by other options @@ -426,16 +426,16 @@ config BUSYBOX_DEBUG Most people should answer N. -config BUSYBOX_DEBUG_PESSIMIZE - bool "Disable compiler optimizations" - default n - depends on BUSYBOX_DEBUG - help - The compiler's optimization of source code can eliminate and reorder - code, resulting in an executable that's hard to understand when - stepping through it with a debugger. This switches it off, resulting - in a much bigger executable that more closely matches the source - code. +#config BUSYBOX_DEBUG_PESSIMIZE +# bool "Disable compiler optimizations" +# default n +# depends on BUSYBOX_DEBUG +# help +# The compiler's optimization of source code can eliminate and reorder +# code, resulting in an executable that's hard to understand when +# stepping through it with a debugger. This switches it off, resulting +# in a much bigger executable that more closely matches the source +# code. # triggers problems on cris with __attribute__((packed)) #config BUSYBOX_WERROR @@ -488,14 +488,14 @@ config BUSYBOX_EFENCE endchoice -config BUSYBOX_INCLUDE_SUSv2 - bool "Enable obsolete features removed before SUSv3?" - default y - help - This option will enable backwards compatibility with SuSv2, - specifically, old-style numeric options ('command -1 <file>') - will be supported in head, tail, and fold. (Note: should - affect renice too.) +#config BUSYBOX_INCLUDE_SUSv2 +# bool "Enable obsolete features removed before SUSv3?" +# default y +# help +# This option will enable backwards compatibility with SuSv2, +# specifically, old-style numeric options ('command -1 <file>') +# will be supported in head, tail, and fold. (Note: should +# affect renice too.) ### config PARSE ### bool "Uniform config file parser debugging applet: parse" @@ -504,12 +504,12 @@ endmenu menu 'Installation Options' -config BUSYBOX_INSTALL_NO_USR - bool "Don't use /usr" - default n - help - Disable use of /usr. Don't activate this option if you don't know - that you really want this behaviour. +#config BUSYBOX_INSTALL_NO_USR +# bool "Don't use /usr" +# default n +# help +# Disable use of /usr. Don't activate this option if you don't know +# that you really want this behaviour. choice prompt "Applets links" diff --git a/package/busybox/config/init/Config.in b/package/busybox/config/init/Config.in index 348509fb9..ddd49ea1b 100644 --- a/package/busybox/config/init/Config.in +++ b/package/busybox/config/init/Config.in @@ -75,16 +75,17 @@ config BUSYBOX_FEATURE_INIT_COREDUMPS core file sizes. If this option is disabled, processes will not generate any core files. -config BUSYBOX_FEATURE_INITRD - bool "Support running init from within an initrd (not initramfs)" - default n - depends on BUSYBOX_INIT - help - Legacy support for running init under the old-style initrd. Allows - the name linuxrc to act as init, and it doesn't assume init is PID 1. - - This does not apply to initramfs, which runs /init as PID 1 and - requires no special support. +# you should never need this, breaks allconfig images +#config BUSYBOX_FEATURE_INITRD +# bool "Support running init from within an initrd (not initramfs)" +# default n +# depends on BUSYBOX_INIT +# help +# Legacy support for running init under the old-style initrd. Allows +# the name linuxrc to act as init, and it doesn't assume init is PID 1. +# +# This does not apply to initramfs, which runs /init as PID 1 and +# requires no special support. config BUSYBOX_HALT bool "poweroff, halt, and reboot" |